3f26422f3a
- Rename patches to match git repository:
* old: 0013-Correct-paths-for-openSUSE.patch
new: 0011-Correct-paths-for-openSUSE.patch
* old: 0014-Check-for-plymouth-lib-directories.patch
new: 0012-Check-for-plymouth-lib-directories.patch
* old: dracut_do_not_update_booloader_if_no_kernel_is_found.patch
new: 0013-mkinitrd-suse-do-not-update-bootloader-if-no-kernel-.patch
* old: suse_grub_manpage.patch
new: 0014-Update-dracut-manpage-for-GRUB-Legacy-and-GRUB2.patch
* old: replace_dhclient_with_wickedd_dhcp_supplicants.patch
new: 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch
* old: 0015-add-new-s390x-specific-rule-files.patch
new: 0016-Add-new-s390x-specific-rule-files.patch
* old: change_write_ifcfg_to_suse.patch
new: 0017-45ifcfg-use-distro-specific-scripts.patch
* old: dracut-fix-whitespace-add-drivers_call.patch
new: 0018-mkinitrd-suse-Fix-whitespaces-when-adding-drivers.patch
* old: wait_for_network_race_condition_fix.patch
new: 0019-40network-Fix-race-condition-when-wait-for-networks.patch
* old: dracut-warpclock_module.patch
new: 0020-00warpclock-Set-correct-timezone.patch
* old: s390-dcssblk.patch
new: 0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch
* old: dracut-install-persistent-rule.patch
new: 0022-95udev-rules-add-persistent-network-rule.patch
* old: dracut-really-always-add-autofs4.patch
new: 0023-systemd-always-tries-to-load-autofs4.patch
* old: mdraid-setup.patch
new: 0024-Fixup-mdraid-setup.patch
* old: 0015-95udev-rules-Add-59-scsi-sg_utils.rules.patch
OBS-URL: https://build.opensuse.org/request/show/236221
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=156
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
|
|
|