Merge remote-tracking branch 'stevee/snort-update' into next

[people/teissler/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..1127099e062a2913912985c68c3aec626662e47b 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,27 +90,25 @@ 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
 
                if [ "${error_value}" -gt 3 -a "${error_value}" -lt 16 ]; then
                        echo_failure
+                       sleep 2
                        boot_mesg -n "FAILURE:\n\nFile system errors" ${FAILURE}
                        boot_mesg -n " were encountered that could not be"
                        boot_mesg -n " fixed automatically.  This system"
                        boot_mesg -n " cannot continue to boot and will"
                        boot_mesg -n " therefore be halted until those"
                        boot_mesg -n " errors are fixed manually by a"
-                       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 " System Administrator.\n\n"
                        boot_mesg "" ${NORMAL}
-                       read ENTER
-                 ${rc_base}/init.d/halt stop
+                       sulogin
+                       reboot -f
                fi
 
                if [ "${error_value}" -ge 16 ]; then