From e548219776e8934492025573169b3c5e2f8a79d1 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 16 Apr 2006 12:31:48 +0000 Subject: altboot: - Fix image_reconf to propperly mount /home.flash - Add another bunch of missing redirects for Collie - Work around error message of playbeep.sh on first-boot - Re-enable propper failsafe fallthroughs in init.altboot --- packages/altboot/files/init.altboot | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'packages/altboot/files/init.altboot') 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 2>&1 - echo -e "\nPress to launch the altboot menu" + echo -e "\nPress to return to the menu" read junk - exec /sbin/init.altboot -force/dev/tty0 2>&1 + + test "$junk" = x && exec /bin/sh || exec /sbin/init.altboot -force/dev/tty0 2>&1 +} + +die() { + echo -e "ERROR: $1" >/dev/tty0 + exec $SH_SHELL /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" -- cgit v1.2.3