Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [CONSOLIDATED PULL 21/32] initrdscripts: fix init-live.sh
Date: Thu, 18 Aug 2011 13:55:40 -0700	[thread overview]
Message-ID: <cda17353980ce57578825767486bcae41bfb3e59.1313700595.git.sgw@linux.intel.com> (raw)
In-Reply-To: <cover.1313700595.git.sgw@linux.intel.com>
In-Reply-To: <cover.1313700595.git.sgw@linux.intel.com>

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.6




  parent reply	other threads:[~2011-08-18 21:00 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 01/32] image.bbclass, kernel.bbclass: create warning file about deleting deploydir files Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 02/32] sanity.bbclass: add optional untested host distro warning Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 03/32] qt4: allow a reduction in build time Saul Wold
2011-08-19 14:34   ` Richard Purdie
2011-08-18 20:55 ` [CONSOLIDATED PULL 04/32] glib-2.0: explicitly disable dtrace and systemtap for native varaint Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 05/32] tcl: fix networking breakage Saul Wold
2011-08-19 14:31   ` Richard Purdie
2011-08-18 20:55 ` [CONSOLIDATED PULL 06/32] perl-native: Update find_perl to find the perl wrapper Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 07/32] busybox: Change ${PN} to ${BPN} in file names Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 08/32] sysvinit: " Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 09/32] qemu: modify search paths for libgl Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 10/32] scripts/runqemu: " Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 11/32] mtd-utils: Added recipe of newer version 1.4.4 Saul Wold
2011-08-19 14:28   ` Richard Purdie
2011-08-18 20:55 ` [CONSOLIDATED PULL 12/32] libxkbcommon: new Saul Wold
2011-08-19 14:27   ` Richard Purdie
2011-08-19 14:33     ` Phil Blundell
2011-08-19 14:40       ` Martin Jansa
2011-08-19 16:08         ` Richard Purdie
2011-08-18 20:55 ` [CONSOLIDATED PULL 13/32] libxslt: fix packaging of static libraries Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 14/32] at: make at usable for common user Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 15/32] conf, recipes: Redefine LINKER_HASH_STYLE Saul Wold
2011-08-19  9:24   ` Phil Blundell
2011-08-19 14:26     ` Richard Purdie
2011-08-19 15:27       ` Khem Raj
2011-08-19 16:13         ` Richard Purdie
2011-08-19 16:35           ` Khem Raj
2011-08-18 20:55 ` [CONSOLIDATED PULL 16/32] gcc-4.6: Use --with-linker-hash-style configure option Saul Wold
2011-08-19 16:23   ` Phil Blundell
2011-08-19 18:29     ` Khem Raj
2011-08-19 18:55       ` Khem Raj
2011-08-18 20:55 ` [CONSOLIDATED PULL 17/32] task-core-tools: Use LTTNGUST variable instead of hardcoding lttng-ust Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 18/32] gdb: Add lttng-ust to DEPENDS only for eglibc Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 19/32] task-core-boot: allow distribution to override default dev_manager provider with VIRTUAL-RUNTIME_dev_manager Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 20/32] bluez4: update recipe from meta-oe Saul Wold
2011-08-18 20:55 ` Saul Wold [this message]
2011-08-22  4:30   ` [CONSOLIDATED PULL 21/32] initrdscripts: fix init-live.sh Tom Zanussi
2011-08-18 20:55 ` [CONSOLIDATED PULL 22/32] curl: Use BPN instead of PN for style like lib${PN} Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 23/32] ea-acl: " Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 24/32] attr: " Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 25/32] acl: " Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 26/32] procps: Fix lib path to support multilib Saul Wold
2011-08-19 14:18   ` Richard Purdie
2011-08-18 20:55 ` [CONSOLIDATED PULL 27/32] eglibc: check dependencies among eglibc options Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 28/32] mailx: update license and distro tracking fileds Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 29/32] slang: add homepage and update distro tracking fields Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 30/32] alsa-tools: update license and add " Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 31/32] newt: update " Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 32/32] file: new file version 5.07 Saul Wold
2011-08-19 16:14 ` [CONSOLIDATED PULL 00/32] Various Fixes, Updates Richard Purdie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cda17353980ce57578825767486bcae41bfb3e59.1313700595.git.sgw@linux.intel.com \
    --to=sgw@linux.intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox