Changed checkfs to auto reboot after correctable fsck fixes.

Changed delay after failing initskript from 3 to one minute.

diff --git a/src/initscripts/init.d/checkfs b/src/initscripts/init.d/checkfs
index fe0f435a1af65f42214bc93f7a7c78d939bb39d1..f31390de952df5cc0a5eabbd2ecc27e420d94955 100644 (file)
--- a/src/initscripts/init.d/checkfs
+++ b/src/initscripts/init.d/checkfs
@@ -48,9 +48,9 @@ case "${1}" in
                        boot_mesg -n " in read-only mode.\n\nAfter you"
                        boot_mesg -n " press Enter, this system will be"
                        boot_mesg -n " halted and powered off."
-                       boot_mesg -n "\n\nPress enter to continue..." ${INFO}
+                       boot_mesg -n "\n\nPress enter to continue or wait a minute..." ${INFO}
                        boot_mesg "" ${NORMAL}
-                       read ENTER
+                       read -t 60 ENTER
                        ${rc_base}/init.d/halt stop
                fi
 
@@ -90,9 +90,9 @@ case "${1}" in
                        boot_mesg -n " errors require this system to be"
                        boot_mesg -n " rebooted.\n\nAfter you press enter,"
                        boot_mesg -n " this system will be rebooted"
-                       boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
+                       boot_mesg -n "\n\nPress Enter to continue or wait a minute..." ${INFO}
                        boot_mesg "" ${NORMAL}
-                       read ENTER
+                       read -t 60 ENTER
                        reboot -f
                fi
 
@@ -107,9 +107,9 @@ case "${1}" in
                        boot_mesg -n " System Administrator.\n\nAfter you"
                        boot_mesg -n " press Enter, this system will be"
                        boot_mesg -n " halted and powered off."
-                       boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
+                       boot_mesg -n "\n\nPress Enter to continue or wait a minute..." ${INFO}
                        boot_mesg "" ${NORMAL}
-                       read ENTER
+                       read -t 60 ENTER
                  ${rc_base}/init.d/halt stop
                fi
 

diff --git a/src/initscripts/init.d/functions b/src/initscripts/init.d/functions
index 04acda3cf258b14d5df943b1d41a5398ecedd9ab..ea840d1a56d1decc4c945e1baadb72d3639fed41 100644 (file)
--- a/src/initscripts/init.d/functions
+++ b/src/initscripts/init.d/functions
@@ -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()