From 4e7221d23bf335cbb4e1e2ba703e4c0a04df7129 Mon Sep 17 00:00:00 2001 From: Jingdong Lu Date: Wed, 24 Aug 2011 15:36:22 +0800 Subject: initrdscripts: fix init-live.sh for hddimg and livecd 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. Signed-off-by: Jingdong Lu --- meta/recipes-core/initrdscripts/files/init-live.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'meta/recipes-core/initrdscripts/files/init-live.sh') diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh index 1cd87e8d94..6a1deba0e2 100644 --- a/meta/recipes-core/initrdscripts/files/init-live.sh +++ b/meta/recipes-core/initrdscripts/files/init-live.sh @@ -1,9 +1,10 @@ #!/bin/sh ROOT_MOUNT="/rootfs/" -ROOT_IMAGE="isolinux/rootfs.img" +ROOT_IMAGE="rootfs.img" MOUNT="/bin/mount" UMOUNT="/bin/umount" +ISOLINUX="" early_setup() { mkdir /proc @@ -58,8 +59,12 @@ while true do for i in `ls /media 2>/dev/null`; do if [ -f /media/$i/$ROOT_IMAGE ] ; then - found="yes" - break + found="yes" + break + elif [ -f /media/$i/isolinux/$ROOT_IMAGE ]; then + found="yes" + ISOLINUX="isolinux" + break fi done if [ "$found" = "yes" ]; then @@ -73,15 +78,15 @@ case $label in mkdir $ROOT_MOUNT 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" else boot_live_root fi ;; install) - if [ -f /media/$i/$ROOT_IMAGE ] ; then - ./install.sh $i $ROOT_IMAGE $video_mode $vga_mode + if [ -f /media/$i/$ISOLINUX/$ROOT_IMAGE ] ; then + ./install.sh $i/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode else fatal "Couldnt find install script" fi -- cgit 1.2.3-korg