From f9b6f41c9249cc90f7621d446eafae5e5508dd6e Mon Sep 17 00:00:00 2001 From: Jingdong Lu Date: Thu, 18 Aug 2011 15:59:58 +0800 Subject: 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 --- meta/recipes-core/initrdscripts/files/init-live.sh | 2 +- meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/initrdscripts') 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 -- cgit 1.2.3-korg