iscsi/parse-iscsiroot.sh: handle firmware in online queue

(cherry picked from commit 7f59cbd31817c81fa5aec9f86c33dfe1ce23ec6a)

diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh
index 35628cc12ce7a801adfb072c005ee1dbc23c8fc0..aa17f8e4a6b30f6981cd67d2167fde4247d21f2c 100755 (executable)
--- a/modules.d/95iscsi/parse-iscsiroot.sh
+++ b/modules.d/95iscsi/parse-iscsiroot.sh
@@ -77,11 +77,11 @@ if [ -n "$iscsi_firmware" ] || getargbool 0 rd.iscsi.ibft -d "ip=ibft"; then
     modprobe -b -q iscsi_ibft
     # if no ip= is given, but firmware
     echo "[ -f '/tmp/iscsistarted-firmware' ]" > $hookdir/initqueue/finished/iscsi_started.sh
-    initqueue --unique --onetime --timeout /sbin/iscsiroot timeout "$netroot" "$NEWROOT"
-    initqueue --unique --onetime --settled /sbin/iscsiroot dummy "'$netroot'" "'$NEWROOT'"
+    initqueue --unique --online /sbin/iscsiroot online "iscsi:" "$NEWROOT"
+    initqueue --unique --onetime --timeout /sbin/iscsiroot timeout "iscsi:" "$NEWROOT"
+    initqueue --unique --onetime --settled /sbin/iscsiroot online "iscsi:" "'$NEWROOT'"
 fi
 
-
 [ -z "$netroot" ] || [ "${netroot%%:*}" = "iscsi" ] || return 1
 
 initqueue --unique --onetime --timeout /sbin/iscsiroot timeout "$netroot" "$NEWROOT"