Thomas Renninger
16452890cf
- By Hannes Reinecke <hare@suse.com>:
- Fixup FCoE booting (bnc#877288)
* Add 0027-95fcoe-Store-current-configuration-in-dracut-cmdline.patch
* Add 0028-95fcoe-update-fcoe-interface-check.patch
* Add 0029-95fcoe-start-lldpad-separately.patch
- Cleanup host_only variable using in mkinitrd
- Remove --force parameter from mkinitrd, we always force anyway
* Add 0030-dracut-mkinitd_cleanup_force_host_only_var.patch
- Remove acpi parameter from mkinitrd, this is done differently nowadays
- Adjust manpage accordingly
OBS-URL: https://build.opensuse.org/request/show/234196
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=144
47 lines
1.2 KiB
Diff
47 lines
1.2 KiB
Diff
--- a/mkinitrd-suse.sh 2014-05-15 15:54:28.000000000 +0200
|
|
+++ b/mkinitrd-suse.sh 2014-05-15 15:57:38.609899222 +0200
|
|
@@ -23,7 +23,6 @@
|
|
boot_dir="/boot"
|
|
quiet=0
|
|
host_only=1
|
|
-force=0
|
|
logfile=/var/log/YaST2/mkinitrd.log
|
|
dracut_cmd=dracut
|
|
|
|
@@ -203,8 +202,6 @@
|
|
for initrd_image in $initrd_images;do
|
|
targets="$targets $initrd_image"
|
|
done
|
|
- host_only=1
|
|
- force=1
|
|
}
|
|
|
|
while (($# > 0)); do
|
|
@@ -217,8 +214,6 @@
|
|
for kernel_image in $kernel_images;do
|
|
kernels="$kernels ${kernel_image#*-}"
|
|
done
|
|
- host_only=1
|
|
- force=1
|
|
;;
|
|
-i) read_arg initrd_images "$@" || shift $?
|
|
for initrd_image in $initrd_images;do
|
|
@@ -274,7 +269,6 @@
|
|
--version|-R)
|
|
echo "mkinitrd: dracut compatibility wrapper"
|
|
exit 0;;
|
|
- --force) force=1;;
|
|
--quiet|-q) quiet=1;;
|
|
*) if [[ ! $targets ]]; then
|
|
targets=$1
|
|
@@ -302,7 +296,8 @@
|
|
else
|
|
dracut_args="${dracut_args} --no-hostonly --no-hostonly-cmdline"
|
|
fi
|
|
-[[ $force == 1 ]] && dracut_args="${dracut_args} --force"
|
|
+dracut_args="${dracut_args} --force"
|
|
+
|
|
[[ $dracut_cmdline ]] && dracut_args="${dracut_args} --kernel-cmdline ${dracut_cmdline}"
|
|
[ -z "$(type -p update-bootloader)" ] && skip_update_bootloader=1
|
|
|