From: Jóhann B. Guðmundsson <johannbg@gmail.com>
Date: Wed, 31 Mar 2021 19:17:43 +0000 (+0000)
Subject: fix(dracut.sh): omission is an addition to other omissions in conf files
X-Git-Tag: 054~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96c313333d1a4f5e2c524a3a11c5b3aab24afc20;p=thirdparty%2Fdracut.git

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).
---

diff --git a/dracut.sh b/dracut.sh
index b71db7dda..0fdcbc4b1 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -936,6 +936,7 @@ export SYSTEMCTL=${SYSTEMCTL:-systemctl}
 
 # 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[*]} "
@@ -945,7 +946,6 @@ export SYSTEMCTL=${SYSTEMCTL:-systemctl}
 
 # 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[*]}"