kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dracut: fixed module dependency handling 

Fail for "--modules" and "--force-add" dracut modules, if they or their
dependencies cannot be included.
master 040
Harald Hoyer 2014-10-24 13:19:58 +02:00
parent eda73c0ad2
commit ab2f95e45e
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dracut-functions.sh
View File

@ -1314,13 +1314,17 @@ check_mount() {
fi fi
fi fi



for _moddep in $(module_depends $_mod); do for _moddep in $(module_depends $_mod); do
# handle deps as if they were manually added # handle deps as if they were manually added
[[ " $add_dracutmodules " == *\ $_moddep\ * ]] || \ [[ " $dracutmodules " == *\ $_mod\ * ]] \
add_dracutmodules+=" $_moddep " && [[ " $dracutmodules " != *\ $_moddep\ * ]] \
[[ " $force_add_dracutmodules " == *\ $_moddep\ * ]] || \ && dracutmodules+=" $_moddep "
force_add_dracutmodules+=" $_moddep " [[ " $add_dracutmodules " == *\ $_mod\ * ]] \
&& [[ " $add_dracutmodules " != *\ $_moddep\ * ]] \
&& add_dracutmodules+=" $_moddep "
[[ " $force_add_dracutmodules " == *\ $_mod\ * ]] \
&& [[ " $force_add_dracutmodules " != *\ $_moddep\ * ]] \
&& force_add_dracutmodules+=" $_moddep "
# if a module we depend on fail, fail also # if a module we depend on fail, fail also
if ! check_module $_moddep; then if ! check_module $_moddep; then
derror "dracut module '$_mod' depends on '$_moddep', which can't be installed" derror "dracut module '$_mod' depends on '$_moddep', which can't be installed"
@ -1358,7 +1362,7 @@ check_module() {
fi fi


if [[ " $dracutmodules $add_dracutmodules $force_add_dracutmodules" == *\ $_mod\ * ]]; then if [[ " $dracutmodules $add_dracutmodules $force_add_dracutmodules" == *\ $_mod\ * ]]; then
if [[ " $force_add_dracutmodules " == *\ $_mod\ * ]]; then if [[ " $dracutmodules $force_add_dracutmodules " == *\ $_mod\ * ]]; then
module_check $_mod 1; ret=$? module_check $_mod 1; ret=$?
else else
module_check $_mod 0; ret=$? module_check $_mod 0; ret=$?
@ -1369,7 +1373,11 @@ check_module() {
# module not in our list # module not in our list
if [[ $dracutmodules = all ]]; then if [[ $dracutmodules = all ]]; then
# check, if we can and should install this module # check, if we can and should install this module
module_check $_mod || return 1 module_check $_mod; ret=$?
if [[ $ret != 0 ]]; then
[[ $2 ]] && return 1
[[ $ret != 255 ]] && return 1
fi
else else
# skip this module # skip this module
return 1 return 1
@ -1378,10 +1386,15 @@ check_module() {


for _moddep in $(module_depends $_mod); do for _moddep in $(module_depends $_mod); do
# handle deps as if they were manually added # handle deps as if they were manually added
[[ " $add_dracutmodules " == *\ $_moddep\ * ]] || \ [[ " $dracutmodules " == *\ $_mod\ * ]] \
add_dracutmodules+=" $_moddep " && [[ " $dracutmodules " != *\ $_moddep\ * ]] \
[[ " $force_add_dracutmodules " == *\ $_moddep\ * ]] || \ && dracutmodules+=" $_moddep "
force_add_dracutmodules+=" $_moddep " [[ " $add_dracutmodules " == *\ $_mod\ * ]] \
&& [[ " $add_dracutmodules " != *\ $_moddep\ * ]] \
&& add_dracutmodules+=" $_moddep "
[[ " $force_add_dracutmodules " == *\ $_mod\ * ]] \
&& [[ " $force_add_dracutmodules " != *\ $_moddep\ * ]] \
&& force_add_dracutmodules+=" $_moddep "
# if a module we depend on fail, fail also # if a module we depend on fail, fail also
if ! check_module $_moddep; then if ! check_module $_moddep; then
derror "dracut module '$_mod' depends on '$_moddep', which can't be installed" derror "dracut module '$_mod' depends on '$_moddep', which can't be installed"
@ -1418,11 +1431,13 @@ for_each_module_dir() {
[[ " $mods_to_load " == *\ $_mod\ * ]] && continue [[ " $mods_to_load " == *\ $_mod\ * ]] && continue


[[ " $force_add_dracutmodules " != *\ $_mod\ * ]] \ [[ " $force_add_dracutmodules " != *\ $_mod\ * ]] \
&& [[ " $dracutmodules " != *\ $_mod\ * ]] \
&& [[ " $omit_dracutmodules " == *\ $_mod\ * ]] \ && [[ " $omit_dracutmodules " == *\ $_mod\ * ]] \
&& continue && continue


derror "dracut module '$_mod' cannot be found or installed." derror "dracut module '$_mod' cannot be found or installed."
[[ " $force_add_dracutmodules " == *\ $_mod\ * ]] && exit 1 [[ " $force_add_dracutmodules " == *\ $_mod\ * ]] && exit 1
[[ " $dracutmodules " == *\ $_mod\ * ]] && exit 1
[[ " $add_dracutmodules " == *\ $_mod\ * ]] && exit 1 [[ " $add_dracutmodules " == *\ $_mod\ * ]] && exit 1
done done
} }

4
dracut.sh
View File

@ -1220,7 +1220,9 @@ fi


[[ -d "$systemdsystemconfdir" ]] || systemdsystemconfdir=/etc/systemd/system [[ -d "$systemdsystemconfdir" ]] || systemdsystemconfdir=/etc/systemd/system


export initdir dracutbasedir dracutmodules \ export initdir dracutbasedir \
dracutmodules force_add_dracutmodules add_dracutmodules omit_dracutmodules \
mods_to_load \
fw_dir drivers_dir debug no_kernel kernel_only \ fw_dir drivers_dir debug no_kernel kernel_only \
omit_drivers mdadmconf lvmconf root_dev \ omit_drivers mdadmconf lvmconf root_dev \
use_fstab fstab_lines libdirs fscks nofscks ro_mnt \ use_fstab fstab_lines libdirs fscks nofscks ro_mnt \