diff options
| author | Richard Purdie <richard@ted.(none)> | 2009-04-28 08:24:11 +0100 |
|---|---|---|
| committer | Richard Purdie <richard@ted.(none)> | 2009-04-28 08:24:11 +0100 |
| commit | 3927e38eba96a172c7df2c7270c31728b83612eb (patch) | |
| tree | 48b0a30d721af9e2f25e03bea8e41035e9ff40bb /meta/packages/initrdscripts | |
| parent | 49ca46f588425c88e37a85df00b1fd4591a01ab6 (diff) | |
| parent | d65be3dd2aaa643b5596c8470caf7f291513efee (diff) | |
| download | openembedded-core-3927e38eba96a172c7df2c7270c31728b83612eb.tar.gz openembedded-core-3927e38eba96a172c7df2c7270c31728b83612eb.tar.bz2 openembedded-core-3927e38eba96a172c7df2c7270c31728b83612eb.tar.xz openembedded-core-3927e38eba96a172c7df2c7270c31728b83612eb.zip | |
Merge ssh://gitserver@git.pokylinux.org/poky
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 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 |