From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 15 Sep 2009 18:09:46 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-beta1~732
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=e70c39047434e945a2817d05b671defdab748123;hp=f359a46eb9edd4b2047fe0a803c52fa872647b1a

Merge branch 'master' into next
---

diff --git a/src/initscripts/init.d/checkfs b/src/initscripts/init.d/checkfs
index fe0f435a1a..f31390de95 100644
--- 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 04acda3cf2..ea840d1a56 100644
--- 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()