summaryrefslogtreecommitdiff
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:05:52 -0700
commitf9b6f41c9249cc90f7621d446eafae5e5508dd6e (patch)
tree698c39f3b4c8e8ec6ea14962207d057da0027631
parentdd678881dfd8626299ee3b68284d2f41f07c1c56 (diff)
downloadopenembedded-core-f9b6f41c9249cc90f7621d446eafae5e5508dd6e.tar.gz
openembedded-core-f9b6f41c9249cc90f7621d446eafae5e5508dd6e.tar.bz2
openembedded-core-f9b6f41c9249cc90f7621d446eafae5e5508dd6e.zip
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. Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com>
-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 @@
#!/bin/sh
ROOT_MOUNT="/rootfs/"
-ROOT_IMAGE=rootfs.img
+ROOT_IMAGE="isolinux/rootfs.img"
MOUNT="/bin/mount"
UMOUNT="/bin/umount"
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"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SRC_URI = "file://init-live.sh"
-PR = "r3"
+PR = "r4"
do_install() {
install -m 0755 ${WORKDIR}/init-live.sh ${D}/init