aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2011-01-16 14:06:38 (GMT)
committerSebastian Pipping <sebastian@pipping.org>2011-01-16 14:07:36 (GMT)
commit1051223a6320bf8e6a0496ffa29ad499a9777915 (patch)
treeb745b64b4550adc01082b58969aa1a0d70b87670
parentUpdate change log (diff)
downloadgenkernel-1051223a6320bf8e6a0496ffa29ad499a9777915.zip
genkernel-1051223a6320bf8e6a0496ffa29ad499a9777915.tar.gz
genkernel-1051223a6320bf8e6a0496ffa29ad499a9777915.tar.bz2
Do no delay if scandelay[=seconds] is not specified (bug #323317 again)
-rwxr-xr-xdefaults/initrd.scripts6
-rwxr-xr-xdefaults/linuxrc4
2 files changed, 5 insertions, 5 deletions
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index d74ed84..25defb7 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -916,13 +916,13 @@ startLUKS() {
}
sdelay() {
- # Sleep a specific number of seconds if SDELAY is set otherwise only sleep
- # 3 seconds, which is a much better default than 1 second (previous default)
+ # Sleep a specific number of seconds if SDELAY is set
if [ "${SDELAY}" ]
then
+ good_msg 'Waiting ${SDELAY} seconds...'
sleep ${SDELAY}
else
- sleep 3
+ good_msg 'Hint: Use parameter scandelay[=seconds] if you need waiting here'
fi
}
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 6ce8349..e9213ac 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -117,7 +117,7 @@ do
SDELAY=`parse_opt "${x}"`
;;
scandelay)
- SDELAY=10
+ SDELAY=3
;;
# Module no-loads
doload\=*)
@@ -286,7 +286,7 @@ else
good_msg 'Skipping module load; no modules in the ramdisk!'
fi
-# Delay if needed for USB hardware
+# Apply scan delay if specified
sdelay
# Setup slow USB bits