From 231ac7094917965a06d7189e9b418d1ba0531a63 Mon Sep 17 00:00:00 2001
From: Matthias Hentges <oe@hentges.net>
Date: Mon, 30 Jan 2006 10:53:54 +0000
Subject: altboot: - First changes to support Kernel 2.6 - As of this push
 altboot should be considered *unstable* until work on 2.6 has finished! - Add
 IGNORE_STRIP_ERRORS = "1" to allow for snapshots

---
 packages/altboot/files/init.altboot | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'packages/altboot/files/init.altboot')

diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index 4d795ced42..506f175c69 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -143,7 +143,11 @@ run_timer() {
 	then
 			
 		mount -t proc proc /proc >/dev/null 2>&1
-		key_ints="`cat /proc/interrupts | grep keyboard | awk '{print $2}'`"
+		
+		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`";;	
+		esac		
 	
 		stty -echo
 		echo -en "\n\nPlease press any key to launch altboot." > /dev/tty1
@@ -152,9 +156,14 @@ run_timer() {
 
 		cnt=0
 		while test "$cnt" != "$TIMEOUT"
-		do
+		do		
 			sleep 1
-			if test "`cat /proc/interrupts | grep keyboard | awk '{print $2}'`" != "$key_ints" 
+			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`";;	
+			esac		
+			
+			if test "$key_ints_now" != "$key_ints" 
 			then				
 				launch_altboot=yes				
 				stty echo
-- 
cgit v1.2.3