merge of 37fc56a61784036cba34459336e8498d980243a2

     and 80830d28dad51d1eb0b440e79ba54aab338b13db

1 files changed, 10 insertions, 5 deletions

diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index cf3a1f8262..7d8b1b6592 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -31,13 +31,18 @@ C_BLUE="\033[34m"
 C_WHITE="\033[37m"
 C_RESET="\033[0m"
 
-die() {
+mdie() {
 	echo "ERROR: $1" >/dev/tty0
-	#exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
 	
-	echo -e "\nPress <ENTER> to launch the altboot menu"
+	echo -e "\nPress <ENTER> to return to the menu"
 	read junk
-	exec /sbin/init.altboot -force</dev/tty0 >/dev/tty0 2>&1
+	
+	test "$junk" = x && exec /bin/sh || exec /sbin/init.altboot -force</dev/tty0 >/dev/tty0 2>&1
+}
+
+die() {
+	echo -e "ERROR: $1" >/dev/tty0
+	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
 }
 
 
@@ -285,7 +290,7 @@ wait_for_input() {
 }
 
 # * * * * * * This is the main function * * * * * *
-# Note: this is positivly ugly. If someone knows a better way to detect wheter
+# Note: this is positively ugly. If someone knows a better way to detect wheter
 # we are already booted into a runlevel _without_ reading /var and / or using `runlevel`
 # PLEASE let me know.
 if test -f /proc/cmdline -a "`ps ax|wc -l|tr -d " "`" -gt 30 -a "$1" != "-force"