56 lines
1.7 KiB
Diff
56 lines
1.7 KiB
Diff
|
From fbd1ae50f37d4d904dc69844de869ff2daf02ded Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hannes Reinecke <hare@suse.de>
|
||
|
|
Date: Tue, 27 Sep 2016 12:38:21 +0200
|
||
|
|
Subject: 95iscsi: wait for network devices when starting iscsi
|
||
|
|
|
||
|
|
rd.iscsi.waitnet should default to false in order for dracut to
|
||
|
|
wait for any network devices to come up.
|
||
|
|
|
||
|
|
References: bsc#997598
|
||
|
|
|
||
|
|
Signed-off-by: Thomas Blume <thomas.blume@suse.com>
|
||
|
|
---
|
||
|
|
modules.d/95iscsi/iscsiroot.sh | 6 ++++--
|
||
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
|
||
|
|
index 77755fb..6f0a15d 100755
|
||
|
|
--- a/modules.d/95iscsi/iscsiroot.sh
|
||
|
|
+++ b/modules.d/95iscsi/iscsiroot.sh
|
||
|
|
@@ -62,13 +62,14 @@ handle_firmware()
|
||
|
|
warn "iscsiadm: Could not get list of targets from firmware."
|
||
|
|
else
|
||
|
|
ifaces=( $(echo /sys/firmware/ibft/ethernet*) )
|
||
|
|
- [ -f /tmp/session-retry ] || echo 1 > /tmp/session-retry
|
||
|
|
retry=$(cat /tmp/session-retry)
|
||
|
|
|
||
|
|
if [ $retry -lt ${#ifaces[*]} ]; then
|
||
|
|
let retry++
|
||
|
|
echo $retry > /tmp/session-retry
|
||
|
|
return 1
|
||
|
|
+ else
|
||
|
|
+ rm /tmp/session-retry
|
||
|
|
fi
|
||
|
|
|
||
|
|
if ! iscsiadm -m fw -l; then
|
||
|
|
@@ -250,7 +251,7 @@ handle_netroot()
|
||
|
|
|
||
|
|
ret=0
|
||
|
|
|
||
|
|
-if [ "$netif" != "timeout" ] && getargbool 1 rd.iscsi.waitnet; then
|
||
|
|
+if [ "$netif" != "timeout" ] && getargbool 0 rd.iscsi.waitnet; then
|
||
|
|
all_ifaces_setup || exit 0
|
||
|
|
fi
|
||
|
|
|
||
|
|
@@ -264,6 +265,7 @@ fi
|
||
|
|
|
||
|
|
if getargbool 0 rd.iscsi.firmware -d -y iscsi_firmware ; then
|
||
|
|
if [ "$netif" = "timeout" ] || [ "$netif" = "online" ]; then
|
||
|
|
+ [ -f /tmp/session-retry ] || echo 1 > /tmp/session-retry
|
||
|
|
handle_firmware
|
||
|
|
ret=$?
|
||
|
|
fi
|
||
|
|
--
|
||
|
|
2.6.6
|
||
|
|
|