summaryrefslogtreecommitdiffstats
path: root/meta/packages/initrdscripts
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2008-11-10 18:50:56 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2008-11-10 18:50:56 +0100
commit2685507637ba11f25d1e35053d4663add2ad51ef (patch)
treefa30fc859fb444a7b1b18225dc752628ab2f9051 /meta/packages/initrdscripts
parentcf96c4ce6ca3901abebe7abefcee0a37ca8c5673 (diff)
downloadpoky-2685507637ba11f25d1e35053d4663add2ad51ef.tar.gz
initrdscripts: Fix the init scripts to support the no fb case.
Diffstat (limited to 'meta/packages/initrdscripts')
-rw-r--r--meta/packages/initrdscripts/files/init-install.sh2
-rw-r--r--meta/packages/initrdscripts/files/init-live.sh6
-rw-r--r--meta/packages/initrdscripts/initramfs-live-boot_1.0.bb2
-rw-r--r--meta/packages/initrdscripts/initramfs-live-install_1.0.bb2
4 files changed, 6 insertions, 6 deletions
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
139echo "timeout 30" >> /ssd/boot/grub/menu.lst 139echo "timeout 30" >> /ssd/boot/grub/menu.lst
140echo "title Poky-Netbook" >> /ssd/boot/grub/menu.lst 140echo "title Poky-Netbook" >> /ssd/boot/grub/menu.lst
141echo "root (hd0,0)" >> /ssd/boot/grub/menu.lst 141echo "root (hd0,0)" >> /ssd/boot/grub/menu.lst
142echo "kernel /boot/vmlinuz root=$rootfs rw video=$3 vga=$4 quiet" >> /ssd/boot/grub/menu.lst 142echo "kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet" >> /ssd/boot/grub/menu.lst
143 143
144cp /media/$1/vmlinuz /ssd/boot/ 144cp /media/$1/vmlinuz /ssd/boot/
145 145
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() {
27 LABEL=*) 27 LABEL=*)
28 label=$optarg ;; 28 label=$optarg ;;
29 video=*) 29 video=*)
30 video_mode=$optarg ;; 30 video_mode=$arg ;;
31 vga=*) 31 vga=*)
32 vga_mode=$optarg ;; 32 vga_mode=$arg ;;
33 esac 33 esac
34 done 34 done
35} 35}
@@ -79,7 +79,7 @@ case $label in
79 ;; 79 ;;
80 install) 80 install)
81 if [ -f /media/$i/$ROOT_IMAGE ] ; then 81 if [ -f /media/$i/$ROOT_IMAGE ] ; then
82 ./install.sh $i $ROOT_IMAGE $video_mode $vga 82 ./install.sh $i $ROOT_IMAGE $video_mode $vga_mode
83 else 83 else
84 fatal "Couldnt find install script" 84 fatal "Couldnt find install script"
85 fi 85 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"
2 2
3SRC_URI = "file://init-live.sh" 3SRC_URI = "file://init-live.sh"
4 4
5PR = "r0" 5PR = "r1"
6 6
7do_install() { 7do_install() {
8 install -m 0755 ${WORKDIR}/init-live.sh ${D}/init 8 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"
2 2
3SRC_URI = "file://init-install.sh" 3SRC_URI = "file://init-install.sh"
4 4
5PR = "r1" 5PR = "r2"
6 6
7RDEPENDS="grub parted e2fsprogs-mke2fs" 7RDEPENDS="grub parted e2fsprogs-mke2fs"
8 8