Patchwork [CONSOLIDATED,PULL,21/32] initrdscripts: fix init-live.sh

login
register
mail settings
Submitter Saul Wold
Date Aug. 18, 2011, 8:55 p.m.
Message ID <cda17353980ce57578825767486bcae41bfb3e59.1313700595.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/10241/
State New, archived
Headers show

Comments

Saul Wold - Aug. 18, 2011, 8:55 p.m.
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(-)
Tom Zanussi - Aug. 22, 2011, 4:30 a.m.
On Thu, 2011-08-18 at 13:55 -0700, Saul Wold wrote:
> 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.
> 

This causes hddimgs to no longer work. e.g. trying to boot jasperforest,
sugarbay, or fri2 using a -live hddimg, the boot hangs with the
following or something similar:

input: Plus More Enterprise LTD. USB-compliant keyboard as /devices/pci0000:00/0
000:00:1a.0/usb1/1-1/1-1.3/1-1.3:1.0/input/input4
generic-usb 0003:0518:0001.0002: input: USB HID v1.10 Keyboard [Plus More Enterp
rise LTD. USB-compliant keyboard] on usb-0000:00:1a.0-1.3/input0
input: Plus More Enterprise LTD. USB-compliant keyboard as /devices/pci0000:00/0
000:00:1a.0/usb1/1-1/1-1.3/1-1.3:1.1/input/input5
generic-usb 0003:0518:0001.0003: input: USB HID v1.10 Mouse [Plus More Enterpris
e LTD. USB-compliant keyboard] on usb-0000:00:1a.0-1.3/input1
scsi 6:0:0:0: Direct-Access     SMI      USB DISK         1100 PQ: 0 ANSI: 0 CCS
sd 6:0:0:0: Attached scsi generic sg2 type 0
sd 6:0:0:0: [sdb] 3915776 512-byte logical blocks: (2.00 GB/1.86 GiB)
sd 6:0:0:0: [sdb] Write Protect is off
sd 6:0:0:0: [sdb] No Caching mode page present
sd 6:0:0:0: [sdb] Assuming drive cache: write through
sd 6:0:0:0: [sdb] No Caching mode page present
sd 6:0:0:0: [sdb] Assuming drive cache: write through
 sdb:
sd 6:0:0:0: [sdb] No Caching mode page present
sd 6:0:0:0: [sdb] Assuming drive cache: write through
sd 6:0:0:0: [sdb] Attached SCSI removable disk

Reverting commit 30ba9839a2dfcd144c3369644c00e1551b820b33 fixes the problem.

Tom

> 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

Patch

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