iscsi/iscsiroot.sh: handle timeout with all interfaces up

restart iscsid, because it may disbehaved

diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
index fc624259d7e6806bfeb7ad9e53ccd41f7b3ee861..ad958129b2146a7e9d2acc4858a9ee5cfc0dce21 100755 (executable)
--- a/modules.d/95iscsi/iscsiroot.sh
+++ b/modules.d/95iscsi/iscsiroot.sh
@@ -197,13 +197,14 @@ handle_netroot()
                             ${iscsi_in_password:+-W $iscsi_in_password} \
                            ${iscsi_iface_name:+--param iface.iscsi_ifacename=$iscsi_iface_name} \
                            ${iscsi_netdev_name:+--param iface.net_ifacename=$iscsi_netdev_name} \
-                            ${iscsi_param} >/dev/null 2>&1
+                            ${iscsi_param} >/dev/null 2>&1 \
+                   && { > $hookdir/initqueue/work ; }
             else
-                systemctl --no-block restart "$netroot_enc" >/dev/null 2>&1
+                systemctl --no-block restart "$netroot_enc" >/dev/null 2>&1 \
+                   && { > $hookdir/initqueue/work ; }
             fi
         fi
     else
-        > $hookdir/initqueue/work
         iscsistart -i $iscsi_initiator -t $iscsi_target_name        \
                    -g $iscsi_target_group -a $iscsi_target_ip      \
                    -p $iscsi_target_port \
@@ -214,7 +215,7 @@ handle_netroot()
                   ${iscsi_iface_name:+--param iface.iscsi_ifacename=$iscsi_iface_name} \
                   ${iscsi_netdev_name:+--param iface.net_ifacename=$iscsi_netdev_name} \
                    ${iscsi_param} \
-           || :
+           && { > $hookdir/initqueue/work ; }
     fi
     netroot_enc=$(str_replace "$1" '/' '\2f')
     echo 'started' > "/tmp/iscsistarted-iscsi:${netroot_enc}"
@@ -227,6 +228,14 @@ if [ "$netif" != "dummy" ] && getargbool 1 rd.iscsi.waitnet; then
     all_ifaces_up || exit 0
 fi
 
+if [ "$netif" = "dummy" ] && all_ifaces_up; then
+    # s.th. went wrong and the timeout script hits
+    # restart
+    systemctl restart iscsid
+    # damn iscsid is not ready after unit says it's ready
+    sleep 2
+fi
+
 # loop over all netroot parameter
 netroot=$(getarg netroot)
 if [ $? -eq 0 ] && [ "$netroot" != "dhcp" ]; then