mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-15 06:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

initrdscripts: fix init-live.sh for hddimg and livecd

Browse Source 
Both hddimg and livecd use init-live.sh script to boot the rootfs.img.
But the paths of rootfs.img in hddimg and livecd are different. So we add
a variable "ISOLINUX" to provide a correct path.

(From OE-Core rev: 4e7221d23bf335cbb4e1e2ba703e4c0a04df7129)

Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jingdong Lu
2011-08-24 15:36:22 +08:00
committed by Richard Purdie
parent 6ba3b6ba9b
commit 4f4475f498
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
meta/recipes-core/initrdscripts/files/init-live.sh
View File

@@ -1,9 +1,10 @@
#!/bin/sh #!/bin/sh
ROOT_MOUNT="/rootfs/" ROOT_MOUNT="/rootfs/"
ROOT_IMAGE="isolinux/rootfs.img" ROOT_IMAGE="rootfs.img"
MOUNT="/bin/mount" MOUNT="/bin/mount"
UMOUNT="/bin/umount" UMOUNT="/bin/umount"
ISOLINUX=""
early_setup() { early_setup() {
mkdir /proc mkdir /proc
@@ -58,8 +59,12 @@ while true
do do
for i in `ls /media 2>/dev/null`; do for i in `ls /media 2>/dev/null`; do
if [ -f /media/$i/$ROOT_IMAGE ] ; then if [ -f /media/$i/$ROOT_IMAGE ] ; then
found="yes" found="yes"
break break
elif [ -f /media/$i/isolinux/$ROOT_IMAGE ]; then
found="yes"
ISOLINUX="isolinux"
break
fi fi
done done
if [ "$found" = "yes" ]; then if [ "$found" = "yes" ]; then
@@ -73,15 +78,15 @@ case $label in
mkdir $ROOT_MOUNT mkdir $ROOT_MOUNT
mknod /dev/loop0 b 7 0 mknod /dev/loop0 b 7 0
if ! $MOUNT -o rw,loop,noatime,nodiratime /media/$i/$ROOT_IMAGE $ROOT_MOUNT ; then if ! $MOUNT -o rw,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE $ROOT_MOUNT ; then
fatal "Couldnt mount rootfs image" fatal "Couldnt mount rootfs image"
else else
boot_live_root boot_live_root
fi fi
;; ;;
install) install)
if [ -f /media/$i/$ROOT_IMAGE ] ; then if [ -f /media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then
./install.sh $i $ROOT_IMAGE $video_mode $vga_mode ./install.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode
else else
fatal "Couldnt find install script" fatal "Couldnt find install script"
fi fi

2
meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
View File

@@ -3,7 +3,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SRC_URI = "file://init-live.sh" SRC_URI = "file://init-live.sh"
PR = "r4" PR = "r5"
do_install() { do_install() {
install -m 0755 ${WORKDIR}/init-live.sh ${D}/init install -m 0755 ${WORKDIR}/init-live.sh ${D}/init