Harald Hoyer d9da66
From 8b4b7dc5b2f1477825cf8a52f412af372b4646f8 Mon Sep 17 00:00:00 2001
Harald Hoyer d9da66
From: Harald Hoyer <harald@redhat.com>
Harald Hoyer d9da66
Date: Fri, 12 Jan 2018 13:45:20 +0100
Harald Hoyer d9da66
Subject: [PATCH] iscsi: remove last iscsid code snippet
Harald Hoyer d9da66
Harald Hoyer d9da66
---
Harald Hoyer d9da66
 modules.d/95iscsi/iscsiroot.sh | 8 --------
Harald Hoyer d9da66
 1 file changed, 8 deletions(-)
Harald Hoyer d9da66
Harald Hoyer d9da66
diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
Harald Hoyer d9da66
index d6325f7d..f7c99a60 100755
Harald Hoyer d9da66
--- a/modules.d/95iscsi/iscsiroot.sh
Harald Hoyer d9da66
+++ b/modules.d/95iscsi/iscsiroot.sh
Harald Hoyer d9da66
@@ -219,14 +219,6 @@ if [ "$netif" != "timeout" ] && getargbool 1 rd.iscsi.waitnet; then
Harald Hoyer d9da66
     all_ifaces_setup || exit 0
Harald Hoyer d9da66
 fi
Harald Hoyer d9da66
 
Harald Hoyer d9da66
-if [ "$netif" = "timeout" ] && all_ifaces_setup; then
Harald Hoyer d9da66
-    # s.th. went wrong and the timeout script hits
Harald Hoyer d9da66
-    # restart
Harald Hoyer d9da66
-    systemctl restart iscsid
Harald Hoyer d9da66
-    # damn iscsid is not ready after unit says it's ready
Harald Hoyer d9da66
-    sleep 2
Harald Hoyer d9da66
-fi
Harald Hoyer d9da66
-
Harald Hoyer d9da66
 if getargbool 0 rd.iscsi.firmware -d -y iscsi_firmware ; then
Harald Hoyer d9da66
     if [ "$netif" = "timeout" ] || [ "$netif" = "online" ]; then
Harald Hoyer d9da66
         handle_firmware
Harald Hoyer d9da66