From: Harald Hoyer <harald@redhat.com>
Date: Thu, 10 Sep 2015 11:21:53 +0000 (+0200)
Subject: iscsi/iscsiroot.sh: use all_ifaces_setup()
X-Git-Tag: 044~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df087c45d820f22e9bf772fa0009d68e647c0af7;p=thirdparty%2Fdracut.git

iscsi/iscsiroot.sh: use all_ifaces_setup()

we want the route and gateway setup

(cherry picked from commit 7cddfbbadbc40a4b6d331be25a3c38ad3a52239b)
---

diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
index e730cb0c4..b14a71b9e 100755
--- a/modules.d/95iscsi/iscsiroot.sh
+++ b/modules.d/95iscsi/iscsiroot.sh
@@ -106,7 +106,7 @@ handle_netroot()
     parse_iscsi_root "$1" || return 1
 
     # Bail out early, if there is no route to the destination
-    if is_ip "$iscsi_target_ip" && [ "$netif" != "timeout" ] && ! all_ifaces_up && getargbool 1 rd.iscsi.testroute; then
+    if is_ip "$iscsi_target_ip" && [ "$netif" != "timeout" ] && ! all_ifaces_setup && getargbool 1 rd.iscsi.testroute; then
         ip route get "$iscsi_target_ip" >/dev/null 2>&1 || return 0
     fi
 
@@ -225,10 +225,10 @@ handle_netroot()
 ret=0
 
 if [ "$netif" != "timeout" ] && getargbool 1 rd.iscsi.waitnet; then
-    all_ifaces_up || exit 0
+    all_ifaces_setup || exit 0
 fi
 
-if [ "$netif" = "timeout" ] && all_ifaces_up; then
+if [ "$netif" = "timeout" ] && all_ifaces_setup; then
     # s.th. went wrong and the timeout script hits
     # restart
     systemctl restart iscsid