From: Sebastian Pipping <sebastian@pipping.org>
Date: Sun, 16 Jan 2011 14:09:36 +0000 (+0100)
Subject: Do not wait for iscsi if we have not started it
X-Git-Tag: v3.4.11~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8b52cccc024cd305563718c07b7eb71eca69a268;p=genkernel.git

Do not wait for iscsi if we have not started it
---

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 25defb7..76a41bd 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -716,6 +716,9 @@ startiscsi() {
 		fi
 
 		iscsistart -i "${ISCSI_INITIATORNAME}" -t "${ISCSI_TARGET}" -a "${ISCSI_ADDRESS}" ${ADDITIONAL}
+
+		# let iscsid settle - otherwise mounting the iSCSI-disk will fail (very rarely, though)
+		sleep 1
 	fi
 }
 
diff --git a/defaults/linuxrc b/defaults/linuxrc
index e9213ac..9e40b31 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -301,9 +301,6 @@ start_dev_mgr
 # Start iSCSI
 startiscsi
 
-# let iscsid settle - otherwise mounting the iSCSI-disk will fail (very rarely, though)
-sleep 1
-
 # Setup btrfs, see bug 303529
 setup_btrfsctl