Skip to content

Commit 699d51c

Browse files
LaszloGombosLaszloGombos
committed
chore(dracut-init.sh): remove support for obsolete syntax
Old syntax dracut modules had its check install installkernel scripts in dedicated shell files and did not support module dependencies.
1 parent 83eccc7 commit 699d51c

File tree

2 files changed

+58
-102
lines changed

2 files changed

+58
-102
lines changed

‎dracut-init.sh

+57-100
Original file line numberDiff line numberDiff line change
@@ -765,28 +765,18 @@ module_check() {
765765
local _hostonly=$hostonly
766766
[[ -z $_moddir ]] && _moddir=$(dracut_module_path "$1")
767767
[ $# -ge 2 ] && _forced=$2
768-
[[ -d $_moddir ]] || return 1
769-
if [[ ! -f $_moddir/module-setup.sh ]]; then
770-
# if we do not have a check script, we are unconditionally included
771-
[[ -x $_moddir/check ]] || return 0
772-
[[ $_forced != 0 ]] && unset hostonly
773-
# don't quote $hostonly to leave argument empty
774-
# shellcheck disable=SC2086
775-
"$_moddir"/check $hostonly
776-
_ret=$?
777-
else
778-
unset check depends cmdline install installkernel
779-
check() { true; }
780-
# shellcheck disable=SC1090
781-
. "$_moddir"/module-setup.sh
782-
is_func check || return 0
783-
[[ $_forced != 0 ]] && unset hostonly
784-
# don't quote $hostonly to leave argument empty
785-
# shellcheck disable=SC2086
786-
moddir="$_moddir" check $hostonly
787-
_ret=$?
788-
unset check depends cmdline install installkernel
789-
fi
768+
[[ -f $_moddir/module-setup.sh ]] || return 1
769+
unset check depends cmdline install installkernel
770+
check() { true; }
771+
# shellcheck disable=SC1090
772+
. "$_moddir"/module-setup.sh
773+
is_func check || return 0
774+
[[ $_forced != 0 ]] && unset hostonly
775+
# don't quote $hostonly to leave argument empty
776+
# shellcheck disable=SC2086
777+
moddir="$_moddir" check $hostonly
778+
_ret=$?
779+
unset check depends cmdline install installkernel
790780
hostonly=$_hostonly
791781
return $_ret
792782
}
@@ -800,21 +790,14 @@ module_check_mount() {
800790
local _ret
801791
export mount_needs=1
802792
[[ -z $_moddir ]] && _moddir=$(dracut_module_path "$1")
803-
[[ -d $_moddir ]] || return 1
804-
if [[ ! -f $_moddir/module-setup.sh ]]; then
805-
# if we do not have a check script, we are unconditionally included
806-
[[ -x $_moddir/check ]] || return 0
807-
mount_needs=1 "$_moddir"/check 0
808-
_ret=$?
809-
else
810-
unset check depends cmdline install installkernel
811-
check() { false; }
812-
# shellcheck disable=SC1090
813-
. "$_moddir"/module-setup.sh
814-
moddir=$_moddir check 0
815-
_ret=$?
816-
unset check depends cmdline install installkernel
817-
fi
793+
[[ -f $_moddir/module-setup.sh ]] || return 1
794+
unset check depends cmdline install installkernel
795+
check() { false; }
796+
# shellcheck disable=SC1090
797+
. "$_moddir"/module-setup.sh
798+
moddir=$_moddir check 0
799+
_ret=$?
800+
unset check depends cmdline install installkernel
818801
unset mount_needs
819802
return "$_ret"
820803
}
@@ -826,22 +809,15 @@ module_depends() {
826809
local _moddir=$2
827810
local _ret
828811
[[ -z $_moddir ]] && _moddir=$(dracut_module_path "$1")
829-
[[ -d $_moddir ]] || return 1
830-
if [[ ! -f $_moddir/module-setup.sh ]]; then
831-
# if we do not have a check script, we have no deps
832-
[[ -x $_moddir/check ]] || return 0
833-
"$_moddir"/check -d
834-
return $?
835-
else
836-
unset check depends cmdline install installkernel
837-
depends() { true; }
838-
# shellcheck disable=SC1090
839-
. "$_moddir"/module-setup.sh
840-
moddir=$_moddir depends
841-
_ret=$?
842-
unset check depends cmdline install installkernel
843-
return $_ret
844-
fi
812+
[[ -f $_moddir/module-setup.sh ]] || return 1
813+
unset check depends cmdline install installkernel
814+
depends() { true; }
815+
# shellcheck disable=SC1090
816+
. "$_moddir"/module-setup.sh
817+
moddir=$_moddir depends
818+
_ret=$?
819+
unset check depends cmdline install installkernel
820+
return $_ret
845821
}
846822

847823
# module_cmdline <dracut module> [<module path>]
@@ -851,21 +827,15 @@ module_cmdline() {
851827
local _moddir=$2
852828
local _ret
853829
[[ -z $_moddir ]] && _moddir=$(dracut_module_path "$1")
854-
[[ -d $_moddir ]] || return 1
855-
if [[ ! -f $_moddir/module-setup.sh ]]; then
856-
# shellcheck disable=SC1090
857-
[[ -x $_moddir/cmdline ]] && . "$_moddir/cmdline"
858-
return $?
859-
else
860-
unset check depends cmdline install installkernel
861-
cmdline() { true; }
862-
# shellcheck disable=SC1090
863-
. "$_moddir"/module-setup.sh
864-
moddir="$_moddir" cmdline
865-
_ret=$?
866-
unset check depends cmdline install installkernel
867-
return $_ret
868-
fi
830+
[[ -f $_moddir/module-setup.sh ]] || return 1
831+
unset check depends cmdline install installkernel
832+
cmdline() { true; }
833+
# shellcheck disable=SC1090
834+
. "$_moddir"/module-setup.sh
835+
moddir="$_moddir" cmdline
836+
_ret=$?
837+
unset check depends cmdline install installkernel
838+
return $_ret
869839
}
870840

871841
# module_install <dracut module> [<module path>]
@@ -875,21 +845,15 @@ module_install() {
875845
local _moddir=$2
876846
local _ret
877847
[[ -z $_moddir ]] && _moddir=$(dracut_module_path "$1")
878-
[[ -d $_moddir ]] || return 1
879-
if [[ ! -f $_moddir/module-setup.sh ]]; then
880-
# shellcheck disable=SC1090
881-
[[ -x $_moddir/install ]] && . "$_moddir/install"
882-
return $?
883-
else
884-
unset check depends cmdline install installkernel
885-
install() { true; }
886-
# shellcheck disable=SC1090
887-
. "$_moddir"/module-setup.sh
888-
moddir="$_moddir" install
889-
_ret=$?
890-
unset check depends cmdline install installkernel
891-
return $_ret
892-
fi
848+
[[ -f $_moddir/module-setup.sh ]] || return 1
849+
unset check depends cmdline install installkernel
850+
install() { true; }
851+
# shellcheck disable=SC1090
852+
. "$_moddir"/module-setup.sh
853+
moddir="$_moddir" install
854+
_ret=$?
855+
unset check depends cmdline install installkernel
856+
return $_ret
893857
}
894858

895859
# module_installkernel <dracut module> [<module path>]
@@ -899,21 +863,15 @@ module_installkernel() {
899863
local _moddir=$2
900864
local _ret
901865
[[ -z $_moddir ]] && _moddir=$(dracut_module_path "$1")
902-
[[ -d $_moddir ]] || return 1
903-
if [[ ! -f $_moddir/module-setup.sh ]]; then
904-
# shellcheck disable=SC1090
905-
[[ -x $_moddir/installkernel ]] && . "$_moddir/installkernel"
906-
return $?
907-
else
908-
unset check depends cmdline install installkernel
909-
installkernel() { true; }
910-
# shellcheck disable=SC1090
911-
. "$_moddir"/module-setup.sh
912-
moddir="$_moddir" installkernel
913-
_ret=$?
914-
unset check depends cmdline install installkernel
915-
return $_ret
916-
fi
866+
[[ -f $_moddir/module-setup.sh ]] || return 1
867+
unset check depends cmdline install installkernel
868+
installkernel() { true; }
869+
# shellcheck disable=SC1090
870+
. "$_moddir"/module-setup.sh
871+
moddir="$_moddir" installkernel
872+
_ret=$?
873+
unset check depends cmdline install installkernel
874+
return $_ret
917875
}
918876

919877
# check_mount <dracut module> [<use_as_dep>] [<module path>]
@@ -1069,8 +1027,7 @@ for_each_module_dir() {
10691027
local _reason
10701028
_func=$1
10711029
for _moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do
1072-
[[ -d $_moddir ]] || continue
1073-
[[ -e $_moddir/install || -e $_moddir/installkernel || -e $_moddir/module-setup.sh ]] || continue
1030+
[[ -e $_moddir/module-setup.sh ]] || continue
10741031
_mod=${_moddir##*/}
10751032
_mod=${_mod#[0-9][0-9]}
10761033
$_func "$_mod" 1 "$_moddir"

‎dracut.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -1377,8 +1377,7 @@ dinfo "Executing: $dracut_cmd ${dracut_args[*]}"
13771377
13781378
[[ $do_list == yes ]] && {
13791379
for mod in "$dracutbasedir"/modules.d/*; do
1380-
[[ -d $mod ]] || continue
1381-
[[ -e $mod/install || -e $mod/installkernel || -e $mod/module-setup.sh ]] || continue
1380+
[[ -e $mod/module-setup.sh ]] || continue
13821381
printf "%s\n" "${mod##*/??}"
13831382
done
13841383
exit 0

0 commit comments

Comments
 (0)