diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-04-23 12:21:06 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-04-23 12:21:06 +0100 |
commit | d65be3dd2aaa643b5596c8470caf7f291513efee (patch) | |
tree | 55b3e8f7db23c38093464fca575d33cf8df6e800 /meta/packages/initrdscripts | |
parent | ed419e2d5773767d904679e18530998839b5f289 (diff) | |
download | poky-d65be3dd2aaa643b5596c8470caf7f291513efee.tar.gz |
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>
Diffstat (limited to 'meta/packages/initrdscripts')
-rw-r--r-- | meta/packages/initrdscripts/files/init-live.sh | 1 | ||||
-rw-r--r-- | meta/packages/initrdscripts/initramfs-live-boot_1.0.bb | 2 |
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 d4e53713ef..c96b1f47c3 100644 --- a/meta/packages/initrdscripts/files/init-live.sh +++ b/meta/packages/initrdscripts/files/init-live.sh | |||
@@ -58,6 +58,7 @@ do | |||
58 | for i in `ls /media 2>/dev/null`; do | 58 | for i in `ls /media 2>/dev/null`; do |
59 | if [ -f /media/$i/$ROOT_IMAGE ] ; then | 59 | if [ -f /media/$i/$ROOT_IMAGE ] ; then |
60 | found="yes" | 60 | found="yes" |
61 | break | ||
61 | fi | 62 | fi |
62 | done | 63 | done |
63 | if [ "$found" = "yes" ]; then | 64 | 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 2c92f73773..07d349c8f5 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" | |||
2 | 2 | ||
3 | SRC_URI = "file://init-live.sh" | 3 | SRC_URI = "file://init-live.sh" |
4 | 4 | ||
5 | PR = "r1" | 5 | PR = "r2" |
6 | 6 | ||
7 | do_install() { | 7 | do_install() { |
8 | install -m 0755 ${WORKDIR}/init-live.sh ${D}/init | 8 | install -m 0755 ${WORKDIR}/init-live.sh ${D}/init |