[gentoo-commits] proj/genkernel:master commit in: defaults/

[Stefan Behte]

commit:     c157e8a5cfab8133a94eab7a765152fc45d3a2a8
Author:     craig <craig <AT> haquarter <DOT> de>
AuthorDate: Thu Feb  4 02:53:48 2016 +0000
Commit:     Stefan Behte <craig <AT> gentoo <DOT> org>
CommitDate: Thu Feb  4 02:54:04 2016 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c157e8a5

Wait for iscsi to settle, use scandelay method

 defaults/initrd.scripts | 3 ---
 defaults/linuxrc        | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index a908cba..890893e 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1140,9 +1140,6 @@ 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 e47c10e..ac8f215 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -374,9 +374,6 @@ fi
 # Ensure that device nodes are properly configured
 mdev -s || bad_msg "mdev -s failed"
 
-# Apply scan delay if specified
-sdelay
-
 cd /
 
 # Start iSCSI
@@ -385,6 +382,9 @@ then
        startiscsi
 fi
 
+# Apply scan delay if specified
+sdelay
+
 # Setup btrfs, see bug 303529
 setup_btrfsctl