diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2008-03-08 21:19:02 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2008-03-08 21:19:02 +0000 |
| commit | 8b41c641e3d71765a2dd2b37f2bc07955c0b2c23 (patch) | |
| tree | 3d5f26ce65eb76408eab53dca2ad26395b618316 | |
| parent | 4ae946cea1f95584e7be2796e045c10244d48eb4 (diff) | |
initramfs-uniboot: Add new global var - CONSOLE - and start to use it as output device.
* This is to workaround bogus console= passed in by bootldr.
| -rw-r--r-- | packages/initrdscripts/files/init.sh | 7 | ||||
| -rw-r--r-- | packages/initrdscripts/initramfs-uniboot_1.0.bb | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh index e250e3928a..c3b4336e40 100644 --- a/packages/initrdscripts/files/init.sh +++ b/packages/initrdscripts/files/init.sh @@ -52,8 +52,8 @@ boot_root() { } fatal() { - echo $1 - echo + echo $1 >$CONSOLE + echo >$CONSOLE exec sh } @@ -61,6 +61,9 @@ fatal() { echo "Starting initramfs boot..." early_setup load_modules '0*' + +[ -z "$CONSOLE" ] && CONSOLE="/dev/console" + read_args if [ -n "$rootdelay" ]; then diff --git a/packages/initrdscripts/initramfs-uniboot_1.0.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb index 10c9459bfb..cfa065b619 100644 --- a/packages/initrdscripts/initramfs-uniboot_1.0.bb +++ b/packages/initrdscripts/initramfs-uniboot_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://init.sh" -PR = "r5" +PR = "r6" DESCRIPTON = "A modular initramfs init script system." RRECOMMENDS = "kernel-module-mtdblock" |