diff options
| author |   Sebastian Pipping <sebastian@pipping.org> | 2011-01-16 15:09:36 +0100 |
|---|---|---|
| committer | Sebastian Pipping <sebastian@pipping.org> | 2011-01-16 15:09:36 +0100 |
| commit | 8b52cccc024cd305563718c07b7eb71eca69a268 (patch) | |
| tree | 7454c5ac7a2d475c8c8acb7e8d76d726cf99c389 /defaults | |
| parent | Do no delay if scandelay[=seconds] is not specified (bug #323317 again) (diff) | |
| download | genkernel-8b52cccc024cd305563718c07b7eb71eca69a268.tar.gz genkernel-8b52cccc024cd305563718c07b7eb71eca69a268.tar.bz2 genkernel-8b52cccc024cd305563718c07b7eb71eca69a268.zip | |
Do not wait for iscsi if we have not started it
Diffstat (limited to 'defaults')
| -rwxr-xr-x | defaults/initrd.scripts | 3 | ||||
| -rwxr-xr-x | defaults/linuxrc | 3 |
2 files changed, 3 insertions, 3 deletions
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 |