diff options
| author |   craig <craig@haquarter.de> | 2016-02-04 03:53:48 +0100 |
|---|---|---|
| committer | craig <craig@haquarter.de> | 2016-02-04 03:54:04 +0100 |
| commit | c157e8a5cfab8133a94eab7a765152fc45d3a2a8 (patch) | |
| tree | f7188bde55d90d02fb31b960ec3976a36bc8c45b | |
| parent | initramfs: lz4 compression (diff) | |
| download | genkernel-c157e8a5cfab8133a94eab7a765152fc45d3a2a8.tar.gz genkernel-c157e8a5cfab8133a94eab7a765152fc45d3a2a8.tar.bz2 genkernel-c157e8a5cfab8133a94eab7a765152fc45d3a2a8.zip | |
Wait for iscsi to settle, use scandelay method
| -rw-r--r-- | defaults/initrd.scripts | 3 | ||||
| -rw-r--r-- | defaults/linuxrc | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index a908cba3..890893ec 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 e47c10e1..ac8f215d 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 |