[PATCH 0/1]initrdscripts: fix init-live.sh

[PATCH 0/1]initrdscripts: fix init-live.sh

[Jingdong.Lu]

From: Jingdong Lu <jingdong.lu@windriver.com>

Fix bug: [YOCTO 686] (partly)

"ROOT_IMAGE" is a wrong path and it can't be mounted when using liveCD. So
modify value of "ROOT_IMAGE" in init-live.sh 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. 

The following changes since commit a21ff559e7c93e9da61104f4a33e42e6004189fd:
  Richard Purdie (1):
        Fixup remaining bb.msg.domain users

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib jingdonglu/bug686
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jingdonglu/bug686

Jingdong Lu (1):
  initrdscripts: fix init-live.sh

 meta/recipes-core/initrdscripts/files/init-live.sh |    2 +-
 .../initrdscripts/initramfs-live-boot_1.0.bb       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[PATCH 1/1] initrdscripts: fix init-live.sh

[Jingdong.Lu]

From: Jingdong Lu <jingdong.lu@windriver.com>

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>
---
 meta/recipes-core/initrdscripts/files/init-live.sh |    2 +-
 .../initrdscripts/initramfs-live-boot_1.0.bb       |    2 +-
 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 f3e5145..1cd87e8 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 7051cbd..140fb1d 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
-- 
1.7.0.4

Re: [PATCH 0/1]initrdscripts: fix init-live.sh

[Saul Wold]

On 08/18/2011 01:50 AM, Jingdong.Lu@windriver.com wrote:
> From: Jingdong Lu<jingdong.lu@windriver.com>
>
> Fix bug: [YOCTO 686] (partly)
>
> "ROOT_IMAGE" is a wrong path and it can't be mounted when using liveCD. So
> modify value of "ROOT_IMAGE" in init-live.sh 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.
>
> The following changes since commit a21ff559e7c93e9da61104f4a33e42e6004189fd:
>    Richard Purdie (1):
>          Fixup remaining bb.msg.domain users
>
> are available in the git repository at:
>
>    git://git.pokylinux.org/poky-contrib jingdonglu/bug686
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jingdonglu/bug686
>
> Jingdong Lu (1):
>    initrdscripts: fix init-live.sh
>
>   meta/recipes-core/initrdscripts/files/init-live.sh |    2 +-
>   .../initrdscripts/initramfs-live-boot_1.0.bb       |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Merged into OE-Core

Although I saw an email that stated this broke other BSP using hddimg, 
did you test this varition?

Thanks
	Sau!