From 96c313333d1a4f5e2c524a3a11c5b3aab24afc20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= Date: Wed, 31 Mar 2021 19:17:43 +0000 Subject: [PATCH] fix(dracut.sh): omission is an addition to other omissions in conf files When omitting a module from the command line via -o or --omit it's expected that it behaves in the same manner as adding a module from the command line as in it does not overwrite existing omissions of other modules in configuration file(s). Reference:https://github.com/dracutdevs/dracut/commit/96c313333d1a4f5e2c524a3a11c5b3aab24afc20 Conflict:context adaptation --- dracut.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dracut.sh b/dracut.sh index 4c1c077..83f2481 100755 --- a/dracut.sh +++ b/dracut.sh @@ -732,6 +732,7 @@ unset NPATH # these options add to the stuff in the config file (( ${#add_dracutmodules_l[@]} )) && add_dracutmodules+=" ${add_dracutmodules_l[@]} " +(( ${#omit_dracutmodules_l[@]} )) && omit_dracutmodules+=" ${omit_dracutmodules_l[@]} " (( ${#force_add_dracutmodules_l[@]} )) && force_add_dracutmodules+=" ${force_add_dracutmodules_l[@]} " (( ${#fscks_l[@]} )) && fscks+=" ${fscks_l[@]} " (( ${#add_fstab_l[@]} )) && add_fstab+=" ${add_fstab_l[@]} " @@ -741,7 +742,6 @@ unset NPATH # these options override the stuff in the config file (( ${#dracutmodules_l[@]} )) && dracutmodules="${dracutmodules_l[@]}" -(( ${#omit_dracutmodules_l[@]} )) && omit_dracutmodules="${omit_dracutmodules_l[@]}" (( ${#filesystems_l[@]} )) && filesystems="${filesystems_l[@]}" (( ${#fw_dir_l[@]} )) && fw_dir="${fw_dir_l[@]}" (( ${#libdirs_l[@]} ))&& libdirs="${libdirs_l[@]}" -- 1.8.3.1