From: Laszlo Gombos Date: Sat, 20 Jul 2024 22:40:43 +0000 (-0400) Subject: feat(shell-interpreter): meta package for improved shell selection X-Git-Tag: 104~178 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1fcfe64fb439ae71fc6babcaac3c6bc834b00a9;p=thirdparty%2Fdracut-ng.git feat(shell-interpreter): meta package for improved shell selection --- diff --git a/.github/labeler.yml b/.github/labeler.yml index 0cea58c29..f06853e0e 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -554,6 +554,10 @@ pcmcia: - changed-files: - any-glob-to-any-file: 'modules.d/90pcmcia/*' +shell-interpreter: + - changed-files: + - any-glob-to-any-file: 'modules.d/00shell-interpreter/*' + test: - changed-files: - any-glob-to-any-file: ['test/*', 'test/**/*', 'modules.d/80test*', 'modules.d/80test*/*'] diff --git a/modules.d/00shell-interpreter/module-setup.sh b/modules.d/00shell-interpreter/module-setup.sh new file mode 100755 index 000000000..64098a389 --- /dev/null +++ b/modules.d/00shell-interpreter/module-setup.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# This file is part of dracut. +# SPDX-License-Identifier: GPL-2.0-or-later + +# Module dependency requirements. +depends() { + # priority order + shells='bash dash busybox' + + for shell in $shells; do + if dracut_module_included "$shell"; then + echo "$shell" + return 0 + fi + done + + shell=$(realpath /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 bfdc51d49..51fc32e4f 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 shell-interpreter return 0 }