From 2685507637ba11f25d1e35053d4663add2ad51ef Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Mon, 10 Nov 2008 18:50:56 +0100
Subject: initrdscripts: Fix the init scripts to support the no fb case.

---
 meta/packages/initrdscripts/files/init-install.sh         | 2 +-
 meta/packages/initrdscripts/files/init-live.sh            | 6 +++---
 meta/packages/initrdscripts/initramfs-live-boot_1.0.bb    | 2 +-
 meta/packages/initrdscripts/initramfs-live-install_1.0.bb | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'meta')

diff --git a/meta/packages/initrdscripts/files/init-install.sh b/meta/packages/initrdscripts/files/init-install.sh
index 4d90f457cd..9ef6c47b8e 100644
--- a/meta/packages/initrdscripts/files/init-install.sh
+++ b/meta/packages/initrdscripts/files/init-install.sh
@@ -139,7 +139,7 @@ echo "default 0" > /ssd/boot/grub/menu.lst
 echo "timeout 30" >> /ssd/boot/grub/menu.lst
 echo "title Poky-Netbook" >> /ssd/boot/grub/menu.lst
 echo "root  (hd0,0)" >> /ssd/boot/grub/menu.lst
-echo "kernel /boot/vmlinuz root=$rootfs rw video=$3 vga=$4 quiet" >> /ssd/boot/grub/menu.lst
+echo "kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet" >> /ssd/boot/grub/menu.lst
 
 cp /media/$1/vmlinuz /ssd/boot/
 
diff --git a/meta/packages/initrdscripts/files/init-live.sh b/meta/packages/initrdscripts/files/init-live.sh
index 96a1a9488f..d4e53713ef 100644
--- a/meta/packages/initrdscripts/files/init-live.sh
+++ b/meta/packages/initrdscripts/files/init-live.sh
@@ -27,9 +27,9 @@ read_args() {
 	    LABEL=*)
 		label=$optarg ;;
 	    video=*)
-		video_mode=$optarg ;;
+		video_mode=$arg ;;
 	    vga=*)
-		vga_mode=$optarg ;;	    
+		vga_mode=$arg ;;
         esac
     done
 }
@@ -79,7 +79,7 @@ case $label in
 	;;
     install)
 	if [ -f /media/$i/$ROOT_IMAGE ] ; then
-	    ./install.sh $i $ROOT_IMAGE $video_mode $vga
+	    ./install.sh $i $ROOT_IMAGE $video_mode $vga_mode
 	else
 	    fatal "Couldnt find install script"
 	fi
diff --git a/meta/packages/initrdscripts/initramfs-live-boot_1.0.bb b/meta/packages/initrdscripts/initramfs-live-boot_1.0.bb
index 0ca962f03e..2c92f73773 100644
--- a/meta/packages/initrdscripts/initramfs-live-boot_1.0.bb
+++ b/meta/packages/initrdscripts/initramfs-live-boot_1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTON = "A live image init script"
 
 SRC_URI = "file://init-live.sh"
 
-PR = "r0"
+PR = "r1"
 
 do_install() {
         install -m 0755 ${WORKDIR}/init-live.sh ${D}/init
diff --git a/meta/packages/initrdscripts/initramfs-live-install_1.0.bb b/meta/packages/initrdscripts/initramfs-live-install_1.0.bb
index 00d6811b4d..baea5e4abd 100644
--- a/meta/packages/initrdscripts/initramfs-live-install_1.0.bb
+++ b/meta/packages/initrdscripts/initramfs-live-install_1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTON = "A live image init script"
 
 SRC_URI = "file://init-install.sh"
 
-PR = "r1"
+PR = "r2"
 
 RDEPENDS="grub parted e2fsprogs-mke2fs"
 
-- 
cgit v1.2.3