Changed checkfs to auto reboot after correctable fsck fixes.

[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 e42bde346e2e24b224d1069039257a5cd0909ec2..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,12 +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}
-       while sleep 180; do
-               read ENTER
-               break
-       done
+       read -t 60 ENTER
 }
 
 check_script_status()
@@ -682,15 +679,21 @@ log_warning_msg() {
        return 0
 }
 
-animate()
-{
-       if [ $# = 0 ]
-               then
-               echo "Usage: animate {hook}"
-               exit 1
-       fi
-
-       splash "$*"
+run_subdir() {
+       DIR=$1
+       for i in $(ls -v ${DIR}* 2> /dev/null); do
+               check_script_status
+               OUT=$(echo $(basename ${i}) | awk -F- '{ print $2 }')
+               case "$OUT" in
+                       S) ${i} start   ;;
+                       K) ${i} stop ;;
+                       RS) ${i} restart ;;
+                       RL) ${i} reload ;;
+                       U) ${i} up ;;
+                       D) ${i} down ;;
+                       *) ${i} ;;
+               esac
+       done
 }
 
 # End $rc_base/init.d/functions