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
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From c99348f3337fde44a98abf5946b7cbf36bce1b0e Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Mon, 5 May 2014 08:38:44 +0200
|
|
Subject: mkinitrd-suse.sh: Use '--hostonly' and '--hostonly-cmdline' correctly
|
|
|
|
LVM and other systems might not be working properly as the
|
|
--hostonly-cmdline flag has to be active by default.
|
|
|
|
References: bnc#874000,bnc#874905,bnc#874363
|
|
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
|
---
|
|
mkinitrd-suse.8.asc | 4 +++-
|
|
mkinitrd-suse.sh | 6 +++++-
|
|
2 files changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/mkinitrd-suse.8.asc b/mkinitrd-suse.8.asc
|
|
index 9eb8fc9..a181b75 100644
|
|
--- a/mkinitrd-suse.8.asc
|
|
+++ b/mkinitrd-suse.8.asc
|
|
@@ -76,7 +76,9 @@ OPTIONS
|
|
|
|
**-A**::
|
|
Create a so called "monster initrd" which includes all available
|
|
- features and modules.
|
|
+ features and modules. This calls dracut with --no-hostonly and
|
|
+ --no-hostonly-cmdline parameters internally, instead of the default
|
|
+ --hostonly and --hostonly-cmdline.
|
|
|
|
**-v, --verbose**::
|
|
increase verbosity level
|
|
diff --git a/mkinitrd-suse.sh b/mkinitrd-suse.sh
|
|
index 1c2634f..c02062d 100755
|
|
--- a/mkinitrd-suse.sh
|
|
+++ b/mkinitrd-suse.sh
|
|
@@ -297,7 +297,11 @@ targets=( $targets )
|
|
[[ $kernels ]] && kernels=( $kernels )
|
|
|
|
[[ $logfile ]] && dracut_args="${dracut_args} --logfile $logfile"
|
|
-[[ $host_only == 1 ]] && dracut_args="${dracut_args} --hostonly"
|
|
+if [[ $host_only == 1 ]];then
|
|
+ dracut_args="${dracut_args} --hostonly --hostonly-cmdline"
|
|
+else
|
|
+ dracut_args="${dracut_args} --no-hostonly --no-hostonly-cmdline"
|
|
+fi
|
|
[[ $force == 1 ]] && dracut_args="${dracut_args} --force"
|
|
[[ $dracut_cmdline ]] && dracut_args="${dracut_args} --kernel-cmdline ${dracut_cmdline}"
|
|
[ -z "$(type -p update-bootloader)" ] && skip_update_bootloader=1
|
|
--
|
|
1.8.5.2
|
|
|