diff options
| author | Mike Westerhof <mwester@dls.net> | 2006-05-25 14:28:00 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-25 14:28:00 +0000 |
| commit | 34cf420fab70b5b1a11a42c864a39bbcf8fb42d8 (patch) | |
| tree | 8dec908a8d3dd7197e431b5185c5c078629aa6f9 /packages/altboot | |
| parent | 3665ab9635a7ebbb1012b55507fa74c966828e01 (diff) | |
| parent | 37fbb9165458b5912a0e676eb39d321e85f1cc79 (diff) | |
merge of bd60f4037ae56c6a4b161d9de8e542983c39be3c
and eaece614d6c87d764b5caab83e36659c8131f64d
Diffstat (limited to 'packages/altboot')
| -rw-r--r-- | packages/altboot/altboot_1.0.7-rc4.bb (renamed from packages/altboot/altboot_1.0.7-rc3.bb) | 0 | ||||
| -rw-r--r-- | packages/altboot/files/init.altboot | 10 |
2 files changed, 7 insertions, 3 deletions
diff --git a/packages/altboot/altboot_1.0.7-rc3.bb b/packages/altboot/altboot_1.0.7-rc4.bb index 245cf2a426..245cf2a426 100644 --- a/packages/altboot/altboot_1.0.7-rc3.bb +++ b/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 $* |