Do not wait for iscsi if we have not started it

14 years ago · 8b52cccc02
parent 1051223a63
commit 8b52cccc02
2 changed files with 3 additions and 3 deletions
--- 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
 }

--- 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