summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-04-23 12:21:06 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-04-23 12:21:06 +0100
commitd65be3dd2aaa643b5596c8470caf7f291513efee (patch)
tree55b3e8f7db23c38093464fca575d33cf8df6e800
parented419e2d5773767d904679e18530998839b5f289 (diff)
downloadopenembedded-core-d65be3dd2aaa643b5596c8470caf7f291513efee.tar.gz
openembedded-core-d65be3dd2aaa643b5596c8470caf7f291513efee.tar.bz2
openembedded-core-d65be3dd2aaa643b5596c8470caf7f291513efee.tar.xz
openembedded-core-d65be3dd2aaa643b5596c8470caf7f291513efee.zip
initramfs-live-boot: Fix script when multiple mounts are present and the last one isn't the correct one
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/initrdscripts/files/init-live.sh1
-rw-r--r--meta/packages/initrdscripts/initramfs-live-boot_1.0.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/packages/initrdscripts/files/init-live.sh b/meta/packages/initrdscripts/files/init-live.sh
index d4e53713e..c96b1f47c 100644
--- a/meta/packages/initrdscripts/files/init-live.sh
+++ b/meta/packages/initrdscripts/files/init-live.sh
@@ -58,6 +58,7 @@ do
for i in `ls /media 2>/dev/null`; do
if [ -f /media/$i/$ROOT_IMAGE ] ; then
found="yes"
+ break
fi
done
if [ "$found" = "yes" ]; then
diff --git a/meta/packages/initrdscripts/initramfs-live-boot_1.0.bb b/meta/packages/initrdscripts/initramfs-live-boot_1.0.bb
index 2c92f7377..07d349c8f 100644
--- a/meta/packages/initrdscripts/initramfs-live-boot_1.0.bb
+++ b/meta/packages/initrdscripts/initramfs-live-boot_1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTON = "A live image init script"
SRC_URI = "file://init-live.sh"
-PR = "r1"
+PR = "r2"
do_install() {
install -m 0755 ${WORKDIR}/init-live.sh ${D}/init