summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorJingdong Lu <jingdong.lu@windriver.com>2011-08-18 15:59:58 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-19 09:29:19 -0700
commit30ba9839a2dfcd144c3369644c00e1551b820b33 (patch)
tree46ff756f6421ad81e2041f79882be1299913e901 /meta/recipes-core
parentb174d51b42b791ae8dd4da8f1d0627e48162b7ab (diff)
downloadpoky-30ba9839a2dfcd144c3369644c00e1551b820b33.tar.gz
initrdscripts: fix init-live.sh
Fix bug: [YOCTO #686] Because the variable "ROOT_IMAGE" in init-live.sh is not correct, it fails to run when using liveCD. Modify value of "ROOT_IMAGE" to "isolinux/rootfs.img". If we want to use liveCD, we also need to add some kernel options related to CDROM support when compling kernel. (From OE-Core rev: f9b6f41c9249cc90f7621d446eafae5e5508dd6e) Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/initrdscripts/files/init-live.sh2
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index f3e514544f..1cd87e8d94 100644
--- a/meta/recipes-core/initrdscripts/files/init-live.sh
+++ b/meta/recipes-core/initrdscripts/files/init-live.sh
@@ -1,7 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2 2
3ROOT_MOUNT="/rootfs/" 3ROOT_MOUNT="/rootfs/"
4ROOT_IMAGE=rootfs.img 4ROOT_IMAGE="isolinux/rootfs.img"
5MOUNT="/bin/mount" 5MOUNT="/bin/mount"
6UMOUNT="/bin/umount" 6UMOUNT="/bin/umount"
7 7
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
index 7051cbd32a..140fb1d1e8 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4SRC_URI = "file://init-live.sh" 4SRC_URI = "file://init-live.sh"
5 5
6PR = "r3" 6PR = "r4"
7 7
8do_install() { 8do_install() {
9 install -m 0755 ${WORKDIR}/init-live.sh ${D}/init 9 install -m 0755 ${WORKDIR}/init-live.sh ${D}/init