Do no delay if scandelay[=seconds] is not specified (bug #323317 again)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index d74ed846007894c0ba4ae682e478703e6c6289ac..25defb7cf98cc25324e0a911048081641d1509ae 100755 (executable)
--- 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 6ce83497c54c269409901516ced22a4eba59520a..e9213acd6535d5c22cc2ec20e5172b268d2f90c7 100755 (executable)
--- 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