Do not wait for iscsi if we have not started it

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 25defb7cf98cc25324e0a911048081641d1509ae..76a41bdc268a4f142d878dffb93739e7cace06d2 100755 (executable)
--- 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 e9213acd6535d5c22cc2ec20e5172b268d2f90c7..9e40b318a53c5576de4ad0e84220fc0cb95090bf 100755 (executable)
--- 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