diff options
| author | Daniel Schaal <farbing@web.de> | 2013-08-16 23:16:15 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2013-08-19 11:13:04 +0200 |
| commit | b7c770e18602020e42f2666034baa9ae4a33662f (patch) | |
| tree | fe70dc07067b287398441f48e53b4e76319742e4 | |
| parent | 324ea606da753d38408698518bfe6be1ff23750c (diff) | |
| download | dracut-b7c770e18602020e42f2666034baa9ae4a33662f.tar.gz dracut-b7c770e18602020e42f2666034baa9ae4a33662f.tar.bz2 dracut-b7c770e18602020e42f2666034baa9ae4a33662f.zip | |
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.
| -rw-r--r-- | dracut.8.asc | 6 | ||||
| -rw-r--r-- | dracut.conf.5.asc | 3 | ||||
| -rwxr-xr-x | dracut.sh | 8 |
3 files changed, 15 insertions, 2 deletions
diff --git a/dracut.8.asc b/dracut.8.asc index 714ba858..ee9d8de2 100644 --- 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 df876cc3..89beeb1c 100644 --- 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. @@ -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//:/ } |