From: Harald Hoyer <harald@redhat.com>
Date: Fri, 17 Jan 2014 13:45:15 +0000 (+0100)
Subject: iscsi: call "iscsistart -b" until it succeeds
X-Git-Tag: 035~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21a3aab720543d2d0f1f4b729acf7997a5937fd3;p=thirdparty%2Fdracut.git

iscsi: call "iscsistart -b" until it succeeds
---

diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
index abdea5cfa..156003c09 100755
--- a/modules.d/95iscsi/iscsiroot.sh
+++ b/modules.d/95iscsi/iscsiroot.sh
@@ -45,11 +45,20 @@ if getargbool 0 rd.iscsi.firmware -d -y iscsi_firmware ; then
     done
 
     if ! [ -e /tmp/iscsistarted-firmware ]; then
-        iscsistart -b $iscsi_param
+        if ! iscsistart -f | vinfo; then
+            warn "iscistart: Could not get list of targets from firmware."
+            exit 1
+        fi
+
+        if ! iscsistart -b $iscsi_param 2>&1 | vinfo; then
+            warn "\`iscsistart -b $iscsi_param\´ failed"
+            exit 1
+        fi
         echo 'started' > "/tmp/iscsistarted-iscsi"
         echo 'started' > "/tmp/iscsistarted-firmware"
         need_shutdown
     fi
+
     [ "$netif" = dummy ] && exit 0
 fi
 
diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh
index 77bd99131..e463addbc 100755
--- a/modules.d/95iscsi/parse-iscsiroot.sh
+++ b/modules.d/95iscsi/parse-iscsiroot.sh
@@ -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 --settled /sbin/iscsiroot dummy "$netroot" "$NEWROOT"
+    initqueue --settled /sbin/iscsiroot dummy "$netroot" "$NEWROOT"
 fi
 
 # If it's not iscsi we don't continue