From 5d33346afdf2153ceed90218a90478c97c559811 Mon Sep 17 00:00:00 2001
From: Matthias Hentges <oe@hentges.net>
Date: Wed, 12 Apr 2006 15:38:38 +0000
Subject: altboot: Fix STDIN error messages on collie

---
 packages/altboot/altboot_0.0.0.bb   |  2 +-
 packages/altboot/files/init.altboot | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'packages/altboot')

diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb
index fbfad3c3e6..73d0cfe87f 100644
--- a/packages/altboot/altboot_0.0.0.bb
+++ b/packages/altboot/altboot_0.0.0.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
 IGNORE_STRIP_ERRORS = "1"
 
-PR = "r36"
+PR = "r37"
 
 
 SRC_URI = "file://altboot-menu \
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index 273160bf19..cf3a1f8262 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -151,7 +151,7 @@ show_sub_menu() {
 # Shows the timer and sets $launch_altboot to yes if a keypress was detected
 run_timer() {
 	if test "$TIMEOUT" != 0
-	then
+	then			
 			
 		mount -t proc proc /proc >/dev/null 2>&1
 		
@@ -161,7 +161,7 @@ run_timer() {
 			test -z "$key_ints" && key_ints="`cat /proc/interrupts | grep -i corgikbd`";;	
 		esac		
 	
-		stty -echo
+		stty -echo  </dev/tty0 >/dev/tty0 2>&1
 		echo -en "\n\nPlease press any key to launch altboot." > /dev/tty1
 		
 		test -z "$TIMEOUT" && TIMEOUT="3"
@@ -179,7 +179,7 @@ run_timer() {
 			if test "$key_ints_now" != "$key_ints" -o -z "$key_ints_now"
 			then				
 				launch_altboot=yes				
-				stty echo
+				stty echo </dev/tty0 >/dev/tty0 2>&1
 				break
 			fi
 			echo -n "." >/dev/tty1
@@ -311,21 +311,18 @@ else
 	do
 		 . /etc/altboot.rc/$file >/dev/tty1 2>&1 || echo "/etc/altboot.rc/$file failed!"
 	done
-		
+			
 	# Make sure altboots master password is set
 	set_password >/dev/tty0 
 	
 	test "$ASK_PW_ON_BOOT" = "yes" && verify_master_pw >/dev/tty0 
 
-
 	# When started with -force, always print the menu
 	echo "$*" | grep -q -- "-force" && TIMEOUT=0
-
 	
 	# This timeout works by reading /proc/interrupts to see if the keyboard interrupt
 	# increases while the timer is running. A TIMEOUT of 0 will always launch altboot.	
-	run_timer >/dev/tty1 2>&1
-
+	run_timer >/dev/tty1 
 		
 	echo "" >/dev/tty0
 	
@@ -344,7 +341,7 @@ else
 		launch_selection /etc/altboot-menu >/dev/tty0
 
 	fi
-	# Anything after this point will never be reached if $launch_altboot != yes
+	# Anything after this point will never be reached if $launch_altboot != yes	
 	
 	# Show the altboot menu
 	show_menu /etc/altboot-menu >/dev/tty0
-- 
cgit v1.2.3