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

Accepting request 230025 from home:pwieczorkiewicz:branches:Base:System

Browse Source 
Fix according to dracut-037 updates (iscsistarted-iscsi:). Adding the ":" sign is mandatory with dracut-037.

OBS-URL: https://build.opensuse.org/request/show/230025
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=132
This commit is contained in:
Thomas Renninger 2014-04-14 14:38:56 +00:00 committed by Git OBS Bridge
parent 57c338177c
commit 884f784b97
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dracut.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Apr 14 14:19:49 UTC 2014 - pwieczorkiewicz@suse.com
- fix-iscsi-firmware.patch:
Fix according to dracut-037 updates (iscsistarted-iscsi:).
-------------------------------------------------------------------
Mon Apr 14 09:00:26 UTC 2014 - pwieczorkiewicz@suse.com

22
fix-iscsi-firmware.patch
View File

@ -8,23 +8,20 @@ Signed-off-by: Hannes Reinecke <hare@suse.de>
modules.d/95iscsi/parse-iscsiroot.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh
index 4be9d56..ec7764e 100755
--- a/modules.d/95iscsi/parse-iscsiroot.sh
+++ b/modules.d/95iscsi/parse-iscsiroot.sh
@@ -61,10 +61,9 @@ fi
# iscsi_firmware does not need argument checking
if [ -n "$iscsi_firmware" ] ; then
- netroot=${netroot:-iscsi:}
+ netroot=${netroot:-iscsi}
Index: dracut-037/modules.d/95iscsi/parse-iscsiroot.sh
===================================================================
--- dracut-037.orig/modules.d/95iscsi/parse-iscsiroot.sh 2014-03-19 17:16:08.000000000 +0100
+++ dracut-037/modules.d/95iscsi/parse-iscsiroot.sh 2014-04-14 16:09:43.390152045 +0200
@@ -64,7 +64,7 @@ if [ -n "$iscsi_firmware" ] ; then
netroot=${netroot:-iscsi:}
modprobe -q iscsi_boot_sysfs 2>/dev/null
modprobe -q iscsi_ibft
- initqueue --onetime --timeout "/sbin/iscsiroot dummy '$netroot' '$NEWROOT'"
+ initqueue --onetime --timeout /sbin/iscsiroot dummy "$netroot" "$NEWROOT"
fi
# If it's not iscsi we don't continue
@@ -88,7 +87,7 @@ fi
@@ -88,7 +88,7 @@ fi
if [ -n "$netroot" ] && [ "$root" != "/dev/root" ] && [ "$root" != "dhcp" ]; then
if ! getargbool 1 rd.neednet >/dev/null || ! getarg "ip="; then
@ -33,6 +30,3 @@ index 4be9d56..ec7764e 100755
fi
fi
--
1.8.1.4