dracut/0023-mkinitrd-suse.sh-Use-hostonly-and-hostonly-cmdline-c.patch
Thomas Renninger 2f8fa9a482 Accepting request 232828 from home:trenn:branches:Base:System
- Update add_dracuts_network_params_for_iscsi.patch to detect
  be2iscsi firmware devices
- Remove obsolete patch fix-iscsi-firmware.sh
- Fixup iscsi firmware booting with be2iscsi (bnc#873448):
  Added 0024-95iscsi-Set-correct-iscsi_started-value-for-iSCSI-fi.patch
- Renamed mkinird_differ_host_and_cmdline_only_properly.patch to
  0023-mkinitrd-suse.sh-Use-hostonly-and-hostonly-cmdline-c.patch

OBS-URL: https://build.opensuse.org/request/show/232828
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=140
2014-05-06 11:22:17 +00:00

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