Blame SOURCES/0320-iscsi-iscsiroot.sh-handle-firmware-in-online-queue.patch

64b87c
From 3bd3bbec319eccd28145f77e42b83b479286ff34 Mon Sep 17 00:00:00 2001
64b87c
From: Harald Hoyer <harald@redhat.com>
64b87c
Date: Tue, 25 Aug 2015 11:14:38 +0200
64b87c
Subject: [PATCH] iscsi/iscsiroot.sh: handle firmware in online queue
64b87c
64b87c
otherwise it does not get called, if no netroot is set
64b87c
---
64b87c
 modules.d/95iscsi/iscsiroot.sh | 32 +++++++++++++++-----------------
64b87c
 1 file changed, 15 insertions(+), 17 deletions(-)
64b87c
64b87c
diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
64b87c
index b7370f6..7688b28 100755
64b87c
--- a/modules.d/95iscsi/iscsiroot.sh
64b87c
+++ b/modules.d/95iscsi/iscsiroot.sh
64b87c
@@ -238,28 +238,26 @@ if [ "$netif" = "timeout" ] && all_ifaces_up; then
64b87c
     sleep 2
64b87c
 fi
64b87c
 
64b87c
-# loop over all netroot parameter
64b87c
-netroot=$(getarg netroot)
64b87c
-if [ $? -eq 0 ] && [ "$netroot" != "dhcp" ]; then
64b87c
-    for nroot in $(getargs netroot); do
64b87c
-        [ "${nroot%%:*}" = "iscsi" ] || continue
64b87c
-        nroot="${nroot##iscsi:}"
64b87c
-        if [ -n "$nroot" ]; then
64b87c
-            handle_netroot "$nroot"
64b87c
-            ret=$(($ret + $?))
64b87c
-        fi
64b87c
-    done
64b87c
+if [ "$netif" = "online" ]; then
64b87c
     if getargbool 0 rd.iscsi.firmware -d -y iscsi_firmware ; then
64b87c
         handle_firmware
64b87c
-        ret=$(($ret + $?))
64b87c
+        ret=$?
64b87c
     fi
64b87c
 else
64b87c
-    if [ -n "$iroot" ]; then
64b87c
-        handle_netroot "$iroot"
64b87c
-        ret=$?
64b87c
+    # loop over all netroot parameter
64b87c
+    nroot=$(getarg netroot)
64b87c
+    if [ $? -eq 0 ] && [ "$nroot" != "dhcp" ]; then
64b87c
+        for nroot in $(getargs netroot); do
64b87c
+            [ "${nroot%%:*}" = "iscsi" ] || continue
64b87c
+            nroot="${nroot##iscsi:}"
64b87c
+            if [ -n "$nroot" ]; then
64b87c
+                handle_netroot "$nroot"
64b87c
+                ret=$(($ret + $?))
64b87c
+            fi
64b87c
+        done
64b87c
     else
64b87c
-        if getargbool 0 rd.iscsi.firmware -d -y iscsi_firmware ; then
64b87c
-            handle_firmware
64b87c
+        if [ -n "$iroot" ]; then
64b87c
+            handle_netroot "$iroot"
64b87c
             ret=$?
64b87c
         fi
64b87c
     fi