diff options
| author | Matthias Hentges <oe@hentges.net> | 2006-04-12 14:05:43 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-12 14:05:43 +0000 |
| commit | 6acda169c92c0c8b4c55ecd3742673c7cfd8edcb (patch) | |
| tree | 003a0422a9a7f69f8e8840f7df97891581e7cc4b /packages/altboot/files/init.altboot | |
| parent | 8045127a9bda8053ed9a3def163b67b89ccc34a0 (diff) | |
altboot:
- Emmit a low-volume beep on alsa devices before running the timeout
- Removed some redirects from init_rootfs
- Fixed CF booting w/ kernel 2.6.16
- Fixed altboot menu on c7x0 running kernel 2.6
Diffstat (limited to 'packages/altboot/files/init.altboot')
| -rw-r--r-- | packages/altboot/files/init.altboot | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot index 22f3e86e83..273160bf19 100644 --- a/packages/altboot/files/init.altboot +++ b/packages/altboot/files/init.altboot @@ -157,7 +157,8 @@ 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`";; + 2.6*) key_ints="`cat /proc/interrupts | grep Spitzkbd`" + test -z "$key_ints" && key_ints="`cat /proc/interrupts | grep -i corgikbd`";; esac stty -echo @@ -171,10 +172,11 @@ run_timer() { sleep 1 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`";; + 2.6*) key_ints_now="`cat /proc/interrupts | grep Spitzkbd`" + test -z "$key_ints_now" && key_ints_now="`cat /proc/interrupts | grep -i corgikbd`";; esac - if test "$key_ints_now" != "$key_ints" + if test "$key_ints_now" != "$key_ints" -o -z "$key_ints_now" then launch_altboot=yes stty echo |