Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

[people/pmueller/ipfire-2.x.git] / src / initscripts / init.d / functions

diff --git a/src/initscripts/init.d/functions b/src/initscripts/init.d/functions
index f9a75b6e2255d77156c169a824b752b8ac753e02..ea840d1a56d1decc4c945e1baadb72d3639fed41 100644 (file)
--- a/src/initscripts/init.d/functions
+++ b/src/initscripts/init.d/functions
@@ -22,7 +22,7 @@ export PATH="/bin:/usr/bin:/sbin:/usr/sbin"
 RELOADSIG="HUP"
 
 # Number of seconds between STOPSIG and FALLBACK when stopping processes
-KILLDELAY="3"
+KILLDELAY="10"
 
 ## Screen Dimensions
 # Find current screen size
@@ -155,9 +155,9 @@ print_error_msg()
        boot_mesg -n " ipfire, please be so kind to inform us at"
        boot_mesg " info@ipfire.org.\n"
        boot_mesg_flush
-       boot_mesg -n "Press Enter to continue or wait 3 minutes..." ${INFO}
+       boot_mesg -n "Press Enter to continue or wait a minute..." ${INFO}
        boot_mesg "" ${NORMAL}
-       read -t 180 ENTER
+       read -t 60 ENTER
 }
 
 check_script_status()