79cfb9c550
- 91zipl: Don't use contents of commented lines (osc#1119499) * adds 0591-91zipl-Don-t-use-contents-of-commented-lines.patch OBS-URL: https://build.opensuse.org/request/show/672495 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=364
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From 38ccf7c8e5e19b1e7ef400ff0a77eb92531754c0 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Abraham <tabraham@suse.com>
|
|
Date: Wed, 19 Dec 2018 18:24:41 -0500
|
|
Subject: [PATCH] 91zipl: Don't use contents of commented lines
|
|
|
|
Comment lines should be ignored. They should not be used for determining
|
|
the /boot/zipl device
|
|
---
|
|
modules.d/91zipl/module-setup.sh | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/modules.d/91zipl/module-setup.sh b/modules.d/91zipl/module-setup.sh
|
|
index d0cd75da..2f95fd55 100755
|
|
--- a/modules.d/91zipl/module-setup.sh
|
|
+++ b/modules.d/91zipl/module-setup.sh
|
|
@@ -22,7 +22,7 @@ depends() {
|
|
installkernel() {
|
|
local _boot_zipl
|
|
|
|
- _boot_zipl=$(sed -n 's/\(.*\)\w*\/boot\/zipl.*/\1/p' /etc/fstab)
|
|
+ _boot_zipl=$(sed -n -e '/^[[:space:]]*#/d' -e 's/\(.*\)\w*\/boot\/zipl.*/\1/p' /etc/fstab)
|
|
if [ -n "$_boot_zipl" ] ; then
|
|
eval $(blkid -s TYPE -o udev ${_boot_zipl})
|
|
if [ -n "$ID_FS_TYPE" ] ; then
|
|
@@ -40,7 +40,7 @@ installkernel() {
|
|
cmdline() {
|
|
local _boot_zipl
|
|
|
|
- _boot_zipl=$(sed -n 's/\(.*\)\w*\/boot\/zipl.*/\1/p' /etc/fstab)
|
|
+ _boot_zipl=$(sed -n -e '/^[[:space:]]*#/d' -e 's/\(.*\)\w*\/boot\/zipl.*/\1/p' /etc/fstab)
|
|
if [ -n "$_boot_zipl" ] ; then
|
|
echo "rd.zipl=${_boot_zipl}"
|
|
fi
|
|
--
|
|
2.16.4
|
|
|