Thomas Renninger
46c37d057a
- Update to latest git HEAD: commit 0fa5dbedc5b222435f51f7460a81232ee120c4e1
Tue May 20 13:23
Modified dracut_v37_to_HEAD.patch
Modified mdraid-setup.patch
Modified dracut-install-persistent-rule.patch
- Add /etc/dracut.d.conf/01-dist modifications to file instead of writing
to it via rpm build section
Add 0033-dracut_hostonly_hostonly_cmdline_default.patch
Add 0034-suse.conf.example_extend.patch
- Cleanup mkinitrd-suse.sh:
* Remove hostonly and hostonly-cmdline -> this is done via 01-dist config
file now
- Always add network module based on modules_setup.sh check() function and not
via 01-dist config file
Add 0035-always_add_network.patch
- Add find to debug binaries - Useful and harmless
Add 0036-add_extra_debug_binaries.patch
- Fix adding of network modules for s390 (bnc#879302)
Add 0037-fix_s390_network_modules_install.patch
- Omit resume module on s390(x) - There is no suspend on s390
Add 0039-s390_no_resume_module.patch
- Do not wait for swap - This causes trouble with Rudi's autobuild images:
Add 0038-remove_waiting_for_swap_dev.patch
- Fcoe and ibft fixes (bnc#879038):
Add 0041-only_enable_network_if_explicitly_requested.patch
Add 0042-ibft_autoconfig_param.patch
Add 0043-fcoe_strip_quotes.patch
- Print message when starting to update bootloader
Add 0044-Add_update_bootloader_msg.patch
- ToDo: Pass hostonly variable earlier so that is always avail in check()
OBS-URL: https://build.opensuse.org/request/show/235703
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=151
53 lines
1.4 KiB
Diff
53 lines
1.4 KiB
Diff
dracut: Cleanup mkinitrd-suse.sh - We always pass --force
|
|
|
|
and no-hostonly is only passed if -A mkinitrd param has been passed.
|
|
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
|
|
|
--- 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
|
|
|