From 2a30da782e48d953507ca793ab0bc7f78b37db9f Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Mon, 5 May 2014 08:48:35 +0200 Subject: 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 --- 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 a965cc6..c1a47d2 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -98,8 +98,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 -- 1.8.5.2