initrdscripts: Fix the init scripts to support the no fb case.

diff --git a/meta/packages/initrdscripts/files/init-install.sh b/meta/packages/initrdscripts/files/init-install.sh
index 4d90f457cd1bd0a50b4eb1df0fcec58dca7d57f0..9ef6c47b8e4e1fdb5db55bfacd85b42dd7e3dec1 100644 (file)
--- 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 96a1a9488f1f0973a31add5e7336d587d981da18..d4e53713ef81dbb07568a8137936027f8b25c047 100644 (file)
--- 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 0ca962f03e994909608326a822f4f141877eb41b..2c92f73773ee42a965c53075f6ad14e29ffa87ed 100644 (file)
--- 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 00d6811b4dea7db00f83ceb1d77e512638b424b1..baea5e4abd5aee3efec42a8fb7bfddccbbc31f15 100644 (file)
--- 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"