From: Harald Hoyer <harald@redhat.com>
Date: Wed, 4 Jul 2018 09:28:33 +0000 (+0200)
Subject: iscsi: do discovery for every network change
X-Git-Tag: 048~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d0848957c0cb9f9796b7f4ec4941000bfaaf6fe;p=thirdparty%2Fdracut.git

iscsi: do discovery for every network change
---

diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
index a71cbcd38..0643d8d86 100755
--- a/modules.d/95iscsi/iscsiroot.sh
+++ b/modules.d/95iscsi/iscsiroot.sh
@@ -218,12 +218,8 @@ handle_netroot()
 
     ### ToDo: Upstream calls systemd-run - Shall we, do we have to port this?
 
-    if iscsiadm -m node; then
-        targets=$(iscsiadm -m node | sed 's/^.*iqn/iqn/')
-    else
-        targets=$(iscsiadm -m discovery -t st -p $iscsi_target_ip:${iscsi_target_port:+$iscsi_target_port} | sed 's/^.*iqn/iqn/')
-        [ -z "$targets" ] && echo "Target discovery to $iscsi_target_ip:${iscsi_target_port:+$iscsi_target_port} failed with status $?" && exit 1
-    fi
+    targets=$(iscsiadm -m discovery -t st -p $iscsi_target_ip:${iscsi_target_port:+$iscsi_target_port} | sed 's/^.*iqn/iqn/')
+    [ -z "$targets" ] && echo "Target discovery to $iscsi_target_ip:${iscsi_target_port:+$iscsi_target_port} failed with status $?" && exit 1
 
     for target in $iscsi_target_name; do
         case "$targets" in