From: Matthias Hentges <oe@hentges.net>
Date: Sun, 21 May 2006 12:03:41 +0000 (+0000)
Subject: altboot: Poodle: Fix boot-timeout, add 1.0.7-rc4
X-Git-Tag: Release-2010-05/1~9453^2~1632^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13af56a1eff8f8f97f80ff34012f54d104cf7a9a;p=openembedded.git

altboot: Poodle: Fix boot-timeout, add 1.0.7-rc4
---

diff --git a/packages/altboot/altboot_1.0.7-rc3.bb b/packages/altboot/altboot_1.0.7-rc4.bb
similarity index 100%
rename from packages/altboot/altboot_1.0.7-rc3.bb
rename to packages/altboot/altboot_1.0.7-rc4.bb
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index 08ba81e962..2c106efa73 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -177,9 +177,12 @@ run_timer() {
 		case "`uname -r`" in
 		2.4*)	key_ints="`cat /proc/interrupts | grep keyboard | awk '{print $2}'`";;
 		2.6*)	key_ints="`cat /proc/interrupts | grep Spitzkbd`"
-			test -z "$key_ints" && key_ints="`cat /proc/interrupts | grep -i corgikbd`";;	
+			test -z "$key_ints" && key_ints="`cat /proc/interrupts | grep -i corgikbd`"
+			test -z "$key_ints" && key_ints="`cat /proc/interrupts | grep -i locomokbd`";;	
 		esac		
 	
+		test -z "$key_ints" && debug_echo "Couldn't read keyboard ints!"
+		
 		stty -echo  <"$OUT_TTY" >"$OUT_TTY" 2>&1
 		echo -en "\n\nPlease press any key to launch altboot." > "$OUT_TTY"
 		
@@ -192,7 +195,8 @@ run_timer() {
 			case "`uname -r`" in
 			2.4*)	key_ints_now="`cat /proc/interrupts | grep keyboard | awk '{print $2}'`";;
 			2.6*)	key_ints_now="`cat /proc/interrupts | grep Spitzkbd`"
-				test -z "$key_ints_now" && key_ints_now="`cat /proc/interrupts | grep -i corgikbd`";;	
+				test -z "$key_ints_now" && key_ints_now="`cat /proc/interrupts | grep -i corgikbd`"
+				test -z "$key_ints_now" && key_ints_now="`cat /proc/interrupts | grep -i locomokbd`";;	
 			esac		
 			
 			if test "$key_ints_now" != "$key_ints" -o -z "$key_ints_now"
@@ -323,7 +327,7 @@ then
 	debug_shell 4 >/dev/null 2>&1 &
 fi
 
-if test -f /proc/cmdline -a "`ps ax|wc -l|tr -d " "`" -gt 30 -a "$1" != "-force"
+if test -f /proc/cmdline -a "`ps ax|wc -l|tr -d " "`" -gt 30 -a "$1" != "-force" -a "$1" != "+force"
 then
 	echo "altboot: Using real init [$REAL_INIT] [$*] [`ps ax|wc -l|tr -d " "`] *" >"$OUT_TTY"
 	exec $REAL_INIT $*