36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From a3a2266046299ef4cfed48ce3a2e6bb573ee0dc7 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Thu, 11 Dec 2014 15:45:59 +0100
|
|
Subject: [PATCH] 95iscsi: Set correct iscsi_started value for iSCSI firmware
|
|
|
|
When iSCSI firmware booting is selected we should not rely on
|
|
'netroot' or 'iscsiroot' variables to be set.
|
|
|
|
References: bnc#873448
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
|
---
|
|
modules.d/95iscsi/parse-iscsiroot.sh | 8 ++++++--
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh
|
|
index ca57668..85c3027 100755
|
|
--- a/modules.d/95iscsi/parse-iscsiroot.sh
|
|
+++ b/modules.d/95iscsi/parse-iscsiroot.sh
|
|
@@ -90,8 +90,12 @@ if [ -n "$netroot" ] && [ "$root" != "/dev/root" ] && [ "$root" != "dhcp" ]; the
|
|
fi
|
|
fi
|
|
|
|
-netroot_enc=$(str_replace "$netroot" '/' '\2f')
|
|
-echo "[ -f '/tmp/iscsistarted-$netroot_enc' ]" > $hookdir/initqueue/finished/iscsi_started.sh
|
|
+if [ -n "$iscsi_firmware" ] ; then
|
|
+ echo "[ -f '/tmp/iscsistarted-firmware' ]" > $hookdir/initqueue/finished/iscsi_started.sh
|
|
+else
|
|
+ netroot_enc=$(str_replace "$netroot" '/' '\2f')
|
|
+ echo "[ -f '/tmp/iscsistarted-$netroot_enc' ]" > $hookdir/initqueue/finished/iscsi_started.sh
|
|
+fi
|
|
|
|
# Done, all good!
|
|
rootok=1
|