From 6c2753bb1b2116a9800cc0344123ba83fd8d87be Mon Sep 17 00:00:00 2001 From: Laszlo Gombos Date: Fri, 24 Nov 2023 15:39:04 -0500 Subject: [PATCH] feat(sh): improve shell selection --- modules.d/00sh/module-setup.sh | 17 +++++++++++++++++ modules.d/99base/module-setup.sh | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100755 modules.d/00sh/module-setup.sh diff --git a/modules.d/00sh/module-setup.sh b/modules.d/00sh/module-setup.sh new file mode 100755 index 0000000000..2495553e28 --- /dev/null +++ b/modules.d/00sh/module-setup.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +depends() { + shells='dash bash mksh busybox' + for shell in $shells; do + if dracut_module_included "$shell"; then + echo "$shell" + return 0 + fi + done + + shell=$(realpath -e /bin/sh) + shell=${shell##*/} + + echo "$shell" + return 0 +} diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh index 54b0deb914..8798cb5aa4 100755 --- a/modules.d/99base/module-setup.sh +++ b/modules.d/99base/module-setup.sh @@ -7,7 +7,7 @@ check() { # called by dracut depends() { - echo udev-rules + echo udev-rules sh return 0 }