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.

diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh
index e250e39..c3b4336 100644 (file)
--- 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 10c9459..cfa065b 100644 (file)
--- 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"