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

defaults/initrd.scripts

@@ -916,13 +916,13 @@ startLUKS() {
 }
 
 sdelay() {
-	# Sleep a specific number of seconds if SDELAY is set otherwise only sleep
+	# Sleep a specific number of seconds if SDELAY is set
-	# 3 seconds, which is a much better default than 1 second (previous default)
 	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
 }
 

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