Changed checkfs to auto reboot after correctable fsck fixes.
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 7 Sep 2009 19:43:39 +0000 (21:43 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 7 Sep 2009 19:43:39 +0000 (21:43 +0200)
Changed delay after failing initskript from 3 to one minute.

src/initscripts/init.d/checkfs
src/initscripts/init.d/functions

index fe0f435..f31390d 100644 (file)
@@ -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 " 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}
                        boot_mesg "" ${NORMAL}
-                       read ENTER
+                       read -t 60 ENTER
                        ${rc_base}/init.d/halt stop
                fi
 
                        ${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 " 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}
                        boot_mesg "" ${NORMAL}
-                       read ENTER
+                       read -t 60 ENTER
                        reboot -f
                fi
 
                        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 " 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}
                        boot_mesg "" ${NORMAL}
-                       read ENTER
+                       read -t 60 ENTER
                  ${rc_base}/init.d/halt stop
                fi
 
                  ${rc_base}/init.d/halt stop
                fi
 
index 04acda3..ea840d1 100644 (file)
@@ -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 " 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}
        boot_mesg "" ${NORMAL}
-       read -t 180 ENTER
+       read -t 60 ENTER
 }
 
 check_script_status()
 }
 
 check_script_status()