pool/dracut
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 514054 from Base:System

Browse Source 
- Ensure dracut.sh responds properly to hostonly cmdline (bsc#1048748)
  * adds 0528-Ensure-dracut.sh-responds-properly-to-hostonly_cmdli.patch (forwarded request 514053 from dmolkentin)

OBS-URL: https://build.opensuse.org/request/show/514054
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dracut?expand=0&rev=111
This commit is contained in:
Yuchen Lin 2017-08-06 09:24:01 +00:00 committed by Git OBS Bridge
commit b9e7069ecd
3 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0528-Ensure-dracut.sh-responds-properly-to-hostonly_cmdli.patch Normal file
View File

@ -0,0 +1,40 @@
From 469d28c50718de7761c91db07ccc7f40821f2d8b Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <dmolkentin@suse.com>
Date: Mon, 17 Jul 2017 16:51:39 +0200
Subject: [PATCH] Ensure dracut.sh responds properly to hostonly_cmdline="no"
Reference: bsc#1048748
---
dracut.conf.5.asc | 2 +-
dracut.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc
index 0460d4ff..3497f349 100644
--- a/dracut.conf.5.asc
+++ b/dracut.conf.5.asc
@@ -97,7 +97,7 @@ Configuration files must have the extension .conf; other extensions are ignored.
instead of a generic host and generate host-specific configuration.
*hostonly_cmdline=*"__{yes|no}__"::
- If set, store the kernel command line arguments needed in the initramfs
+ If set to "yes", store the kernel command line arguments needed in the initramfs
*persistent_policy=*"__<policy>__"::
Use _<policy>_ to address disks and partitions.
diff --git a/dracut.sh b/dracut.sh
index 492ecbf7..35d7e134 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -1708,7 +1708,7 @@ if ! ( echo $PARMS_TO_STORE > $initdir/lib/dracut/build-parameter.txt ); then
exit 1
fi
-if [[ $hostonly_cmdline ]] ; then
+if [[ $hostonly_cmdline == "yes" ]] ; then
unset _stored_cmdline
if [ -d $initdir/etc/cmdline.d ];then
dinfo "Stored kernel commandline:"
--
2.12.3

6
dracut.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 2 13:11:02 UTC 2017 - daniel.molkentin@suse.com
- Ensure dracut.sh responds properly to hostonly cmdline (bsc#1048748)
* adds 0528-Ensure-dracut.sh-responds-properly-to-hostonly_cmdli.patch
-------------------------------------------------------------------
Thu Jul 13 15:15:29 UTC 2017 - daniel.molkentin@suse.com

2
dracut.spec
View File

@ -209,6 +209,7 @@ Patch524: 0524-Suppress-nonsensical-error-message-bsc-1032029.patch
Patch525: 0525-backport-bail-out-if-module-directory-does-not-exist.patch
Patch526: 0526-iscsiroot-call-handle_firmware-only-for-non-iface-in.patch
Patch527: 0527-switch-fips-checking-to-use-the-libkcapi-based-fipsc.patch
Patch528: 0528-Ensure-dracut.sh-responds-properly-to-hostonly_cmdli.patch
BuildRequires: asciidoc
BuildRequires: bash
@ -443,6 +444,7 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh
%patch525 -p1
%patch526 -p1
%patch527 -p1
%patch528 -p1
%build
%configure\