dracut.sh: Fix [no-]early-microcode parameter and add documentation.

[no-]early-microcode was missing from getopt argument list.

Let arguments passed by command line override config files.

diff --git a/dracut.8.asc b/dracut.8.asc
index 714ba858e847ff54de6becc757989fae7fe6ae7a..ee9d8de2466c83d3bf13928e432b98744fd4eef1 100644 (file)
--- a/dracut.8.asc
+++ b/dracut.8.asc
@@ -225,6 +225,12 @@ example:
 **--no-kernel**::
     do not install kernel drivers and firmware files
 
+**--early-microcode**::
+    Combine early microcode with ramdisk
+
+**--no-early-microcode**::
+    Do not combine early microcode with ramdisk
+
 **--print-cmdline**::
     print the kernel command line for the current disk layout
 

diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc
index df876cc3d6a3e607e728b99a1cb0e39cf402bde3..89beeb1ced1bc9c5a35e57de7cdf88ccb4f790ac 100644 (file)
--- a/dracut.conf.5.asc
+++ b/dracut.conf.5.asc
@@ -117,6 +117,9 @@ If chrooted to another root other than the real root device, use --fstab and pro
 *no_kernel=*"{yes|no}"::
     Do not install kernel drivers and firmware files (default=no)
 
+*early_microcode=*"{yes|no}"::
+    Combine early microcode with ramdisk (default=no)
+
 *stdloglvl*="__\{0-6\}__"::
     Set logging to standard error level.
 

diff --git a/dracut.sh b/dracut.sh
index d0d1c11817ce947a3afce77190d86464c296123c..7071d05cf4a2a608d572ab4af29a4cfc025aac75 100755 (executable)
--- a/dracut.sh
+++ b/dracut.sh
@@ -346,6 +346,8 @@ TEMP=$(unset POSIXLY_CORRECT; getopt \
     --long printsize \
     --long regenerate-all \
     --long noimageifnotneeded \
+    --long early-microcode \
+    --long no-early-microcode \
     -- "$@")
 
 if (( $? != 0 )); then
@@ -388,8 +390,8 @@ while :; do
         --kernel-only) kernel_only="yes"; no_kernel="no";;
         --no-kernel)   kernel_only="no"; no_kernel="yes";;
         --print-cmdline) print_cmdline="yes"; hostonly_l="yes"; kernel_only="yes"; no_kernel="yes";;
-        --early-microcode) early_microcode="yes";;
-        --no-early-microcode) early_microcode="no";;
+        --early-microcode) early_microcode_l="yes";;
+        --no-early-microcode) early_microcode_l="no";;
         --strip)       do_strip_l="yes";;
         --nostrip)     do_strip_l="no";;
         --hardlink)    do_hardlink_l="yes";;
@@ -665,6 +667,8 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
 [[ $show_modules_l ]] && show_modules=$show_modules_l
 [[ $nofscks_l ]] && nofscks="yes"
 [[ $ro_mnt_l ]] && ro_mnt="yes"
+[[ $early_microcode_l ]] && early_microcode=$early_microcode_l
+[[ $early_microcode ]] || early_microcode=no
 # eliminate IFS hackery when messing with fw_dir
 fw_dir=${fw_dir//:/ }