Changed checkfs to auto reboot after correctable fsck fixes.

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

diff --git a/src/initscripts/init.d/checkfs b/src/initscripts/init.d/checkfs
index 484721398b9f2bd0aa818e594a46b818dbf26cd2..f31390de952df5cc0a5eabbd2ecc27e420d94955 100644 (file)
--- a/src/initscripts/init.d/checkfs
+++ b/src/initscripts/init.d/checkfs
@@ -30,8 +30,8 @@
 
 case "${1}" in
        start)
-               if [ ! -f /.autofsck ]; then
-                       boot_mesg -n "No /.autofsck found, will not perform" ${INFO}
+               if [ -f /fastboot ]; then
+                       boot_mesg -n "/fastboot found, will not perform" ${INFO}
                        boot_mesg " file system checks as requested."
                        echo_ok
                        exit 0
@@ -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