[PATCH v2 1/2] module-setup: move kdump_setup_netdev early when handling iscsi

[WANG Chao]

Move kdump_setup_netdev in iscsi handling path early. Because when we
detect ibft or firmware iscsi session, we will bail out early, but still
need to bring up network device in 2nd kernel.

Signed-off-by: WANG Chao <chaowang at redhat.com>
---
 dracut-module-setup.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index dcebc47..b6218b3 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -434,8 +434,15 @@ kdump_setup_iscsi_device() {
         return 1
     fi
 
-    tgt_name=$(kdump_iscsi_get_rec_val ${path} "node.name")
     tgt_ipaddr=$(kdump_iscsi_get_rec_val ${path} "node.conn\[0\].address")
+    netdev=$(/sbin/ip route get to ${tgt_ipaddr} | \
+        sed 's|.*dev \(.*\).*|\1|g')
+    srcaddr=$(echo $netdev | awk '{ print $3; exit }')
+    netdev=$(echo $netdev | awk '{ print $1; exit }')
+
+    kdump_setup_netdev $netdev $srcaddr $tgt_ipaddr
+
+    tgt_name=$(kdump_iscsi_get_rec_val ${path} "node.name")
 
     # get and set username and password details
     username=$(kdump_iscsi_get_rec_val ${path} "node.session.auth.username")
@@ -452,13 +459,6 @@ kdump_setup_iscsi_device() {
 
     [ -n "$username_in" ] && userpwd_in_str=":$username_in:$password_in"
 
-    netdev=$(/sbin/ip route get to ${tgt_ipaddr} | \
-        sed 's|.*dev \(.*\).*|\1|g')
-    srcaddr=$(echo $netdev | awk '{ print $3; exit }')
-    netdev=$(echo $netdev | awk '{ print $1; exit }')
-
-    kdump_setup_netdev $netdev $srcaddr $tgt_ipaddr
-
     # prepare netroot= command line
     # FIXME: IPV6 addresses require explicit [] around $tgt_ipaddr
     # FIXME: Do we need to parse and set other parameters like protocol, port
-- 
1.9.3