[oe-commits] org.oe.dev initramfs-*: Use $CONSOLE for input/output.

[pfalcon commit]

initramfs-*: Use $CONSOLE for input/output.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 964b526e0c04a7efb6b0c656617576147da17592
ViewMTN: http://monotone.openembedded.org/revision/info/964b526e0c04a7efb6b0c656617576147da17592
Files:
1
packages/initrdscripts/files/30-bootmenu.sh
packages/initrdscripts/files/87-kexecboot.sh
packages/initrdscripts/files/init.sh
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
packages/initrdscripts/initramfs-module-kexecboot_1.0.bb
packages/initrdscripts/initramfs-uniboot_1.0.bb
Diffs:

#
# mt diff -r5cd478e89cc391b108fb9a7bc23d863e9e2ebbf2 -r964b526e0c04a7efb6b0c656617576147da17592
#
#
#
# patch "packages/initrdscripts/files/30-bootmenu.sh"
#  from [505477ef54500012245c4b73e55bab875abbd964]
#    to [32135d4222e580fde5519b1a7416ae4f88707d97]
# 
# patch "packages/initrdscripts/files/87-kexecboot.sh"
#  from [73528951640012dc82e2f85bfa592a5762cc3f45]
#    to [3d3d0f3d83e60e2679d46b48f2b2ee16e9320ec6]
# 
# patch "packages/initrdscripts/files/init.sh"
#  from [c3caf34532f8b24aeef2f195ceffcd7ace300962]
#    to [14e96ee63df61b4002240224d1884c5255725646]
# 
# patch "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
#  from [787b756415c69f2202b3abc828c203d46d04606d]
#    to [3b8d3a8331be1d3c854c539093fccf5e97c67889]
# 
# patch "packages/initrdscripts/initramfs-module-kexecboot_1.0.bb"
#  from [50b73fbc6eac528a3565056e247019833cf00d3b]
#    to [3abc34b3ee6e3d179139405a6e7554b2664a3a30]
# 
# patch "packages/initrdscripts/initramfs-uniboot_1.0.bb"
#  from [7e0c529c41c46e4ac3fe84cf042dddb05f824a5d]
#    to [4fe470a93794e0f45af8847e573847a31394b771]
#
============================================================
--- packages/initrdscripts/files/30-bootmenu.sh	505477ef54500012245c4b73e55bab875abbd964
+++ packages/initrdscripts/files/30-bootmenu.sh	32135d4222e580fde5519b1a7416ae4f88707d97
@@ -36,14 +36,14 @@ show_menu() {
 }
 
 show_menu() {
-    echo -e -n "${E}3;0H"
+    echo -e -n "${E}3;0H" >$CONSOLE
     cnt=0
     echo -e $list | \
     while read l; do
         if [ $cnt == $num ]; then
-	    echo -e -n "${E}1m"
+	    echo -e -n "${E}1m" >$CONSOLE
 	fi
-        echo -e "$cnt: $l${E}0m"
+        echo -e "$cnt: $l${E}0m" >$CONSOLE
 	cnt=$((cnt + 1))
     done
 }
@@ -109,14 +109,14 @@ num=0
 num=0
 
 # Draw UI
-stty -echo
-echo -e -n "${E}2J"
-echo -e -n "${E}0;0H"
-echo "Select boot image:"
+stty -F $CONSOLE -echo
+echo -e -n "${E}2J" >$CONSOLE
+echo -e -n "${E}0;0H" >$CONSOLE
+echo "Select boot image:" >$CONSOLE
 
 # Main loop
 show_menu
-while read -n1 i; do
+while read -s -n1 i; do
     case "$i" in
 	"A")
 	    num=$((num - 1))
@@ -139,7 +139,7 @@ while read -n1 i; do
     esac
     show_menu
 #    echo "*$esc$i"
-done
+done < $CONSOLE
 
 stty echo
 
@@ -170,8 +170,8 @@ fi
     CMDLINE="$CMDLINE root=$ROOT_DEVICE"
 fi
 
-echo ROOT_DEVICE=$ROOT_DEVICE
-echo CMDLINE=$CMDLINE
+echo ROOT_DEVICE=$ROOT_DEVICE >$CONSOLE
+echo CMDLINE=$CMDLINE >$CONSOLE
 
 ##############################
 fi
============================================================
--- packages/initrdscripts/files/87-kexecboot.sh	73528951640012dc82e2f85bfa592a5762cc3f45
+++ packages/initrdscripts/files/87-kexecboot.sh	3d3d0f3d83e60e2679d46b48f2b2ee16e9320ec6
@@ -3,15 +3,15 @@ if [ -n "$BOOT_ROOT" -a -f "$BOOT_ROOT/b
 
 if [ -n "$BOOT_ROOT" -a -f "$BOOT_ROOT/boot/zImage" ]; then
     if ! expr "$CMDLINE" : '.*nokexec'; then
-	echo "Kernel found in rootfs:"
-	ls -l "$BOOT_ROOT/boot/zImage"
+	echo "Kernel found in rootfs:" >$CONSOLE
+	ls -l "$BOOT_ROOT/boot/zImage" >$CONSOLE
 	initramfs=""
 	if [ -f "$BOOT_ROOT/boot/initramfs.bin" ]; then
 	    echo "Initramfs found in rootfs:"
 	    ls -l "$BOOT_ROOT/boot/initramfs.bin"
     	    initramfs="--initrd=$BOOT_ROOT/boot/initramfs.bin"
         fi
-	echo /usr/sbin/kexec -f "$BOOT_ROOT/boot/zImage" $initramfs --command-line="$CMDLINE nokexec"
+	echo /usr/sbin/kexec -f "$BOOT_ROOT/boot/zImage" $initramfs --command-line="$CMDLINE nokexec" >$CONSOLE
         sleep 10
 	/usr/sbin/kexec -f "$BOOT_ROOT/boot/zImage" $initramfs --command-line="$CMDLINE nokexec"
         sleep 10000
============================================================
--- packages/initrdscripts/files/init.sh	c3caf34532f8b24aeef2f195ceffcd7ace300962
+++ packages/initrdscripts/files/init.sh	14e96ee63df61b4002240224d1884c5255725646
@@ -41,6 +41,7 @@ load_modules() {
 
 load_modules() {
     for module in $MODULE_DIR/$1; do
+	# Cannot redir to $CONSOLE here easily - may not be set yet
         echo "initramfs: Loading $module module"
         source $module
     done
@@ -67,7 +68,7 @@ if [ -n "$rootdelay" ]; then
 read_args
 
 if [ -n "$rootdelay" ]; then
-    echo "Waiting $rootdelay seconds for devices to settle..."
+    echo "Waiting $rootdelay seconds for devices to settle..." >$CONSOLE
     sleep $rootdelay
 fi
 
============================================================
--- packages/initrdscripts/initramfs-module-bootmenu_1.0.bb	787b756415c69f2202b3abc828c203d46d04606d
+++ packages/initrdscripts/initramfs-module-bootmenu_1.0.bb	3b8d3a8331be1d3c854c539093fccf5e97c67889
@@ -1,5 +1,5 @@ SRC_URI = "file://30-bootmenu.sh"
 SRC_URI = "file://30-bootmenu.sh"
-PR = "r15"
+PR = "r16"
 DESCRIPTION = "An initramfs module with UI for selection of boot device."
 RDEPENDS = "klibc-utils-static-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs"
 # For VFAT mounting.
============================================================
--- packages/initrdscripts/initramfs-module-kexecboot_1.0.bb	50b73fbc6eac528a3565056e247019833cf00d3b
+++ packages/initrdscripts/initramfs-module-kexecboot_1.0.bb	3abc34b3ee6e3d179139405a6e7554b2664a3a30
@@ -1,5 +1,5 @@ SRC_URI = "file://87-kexecboot.sh"
 SRC_URI = "file://87-kexecboot.sh"
-PR = "r0.4"
+PR = "r1"
 DESCRIPTION = "An initramfs module for kexecing kernel from rootfs."
 RDEPENDS = "initramfs-uniboot kexec-static"
 
============================================================
--- packages/initrdscripts/initramfs-uniboot_1.0.bb	7e0c529c41c46e4ac3fe84cf042dddb05f824a5d
+++ packages/initrdscripts/initramfs-uniboot_1.0.bb	4fe470a93794e0f45af8847e573847a31394b771
@@ -1,5 +1,5 @@ SRC_URI = "file://init.sh"
 SRC_URI = "file://init.sh"
-PR = "r6"
+PR = "r7"
 DESCRIPTON = "A modular initramfs init script system."
 RRECOMMENDS = "kernel-module-mtdblock"