diff --git a/dracut-init.sh b/dracut-init.sh index b1ac996..ab07cab 100644 --- a/dracut-init.sh +++ b/dracut-init.sh @@ -154,6 +154,10 @@ dracut_no_switch_root() { >"$initdir/lib/dracut/no-switch-root" } +dracut_module_path() { + echo ${dracutbasedir}/modules.d/??${1} | { read a b; echo "$a"; } +} + if ! [[ $DRACUT_INSTALL ]]; then DRACUT_INSTALL=$(find_binary dracut-install) fi diff --git a/dracut.sh b/dracut.sh index 8144a16..f270af7 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1373,7 +1373,7 @@ do_print_cmdline() for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do _d_mod=${moddir##*/}; _d_mod=${_d_mod#[0-9][0-9]} [[ ${_mods_to_print[$_d_mod]} ]] || continue - module_cmdline "$_d_mod" + module_cmdline "$_d_mod" "$moddir" done unset moddir } @@ -1454,14 +1454,14 @@ for moddir in "$dracutbasedir/modules.d"/[0-9][0-9]*; do dinfo "*** Including module: $_d_mod ***" fi if [[ $kernel_only == yes ]]; then - module_installkernel "$_d_mod" || { + module_installkernel "$_d_mod" "$moddir" || { dfatal "installkernel failed in module $_d_mod" exit 1 } else - module_install "$_d_mod" + module_install "$_d_mod" "$moddir" if [[ $no_kernel != yes ]]; then - module_installkernel "$_d_mod" || { + module_installkernel "$_d_mod" "$moddir" || { dfatal "installkernel failed in module $_d_mod" exit 1 }