9e84022b95
Fix of the previous request rq#230025 (one line extra added by mistake). OBS-URL: https://build.opensuse.org/request/show/230174 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=133
32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
From af3c6eb8a04c2e526061f1dc82a94f01408bb415 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Mon, 7 Apr 2014 16:28:34 +0200
|
|
Subject: [PATCH] 95iscsi: Fix iSCSI firmware path
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/95iscsi/parse-iscsiroot.sh | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
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-15 11:49:40.922075002 +0200
|
|
@@ -64,7 +64,6 @@ 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'"
|
|
fi
|
|
|
|
# If it's not iscsi we don't continue
|
|
@@ -88,7 +87,7 @@ fi
|
|
|
|
if [ -n "$netroot" ] && [ "$root" != "/dev/root" ] && [ "$root" != "dhcp" ]; then
|
|
if ! getargbool 1 rd.neednet >/dev/null || ! getarg "ip="; then
|
|
- initqueue --onetime --settled "/sbin/iscsiroot dummy '$netroot' '$NEWROOT'"
|
|
+ initqueue --settled /sbin/iscsiroot dummy "$netroot" "$NEWROOT"
|
|
fi
|
|
fi
|
|
|