summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2006-02-05 21:13:49 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-02-05 21:13:49 +0000
commit8b1cc22759301dfcbb1c31d4c23562069b2b0d26 (patch)
tree0d6a187c8394c83e1e00eb21b52f4fb21f02998c
parent8726067c7f470e98632afb60c72f0f94ba8567f2 (diff)
slugos-init: do not create recovery in boot/disk in 0.10
-rw-r--r--packages/slugos-init/files/boot/disk8
-rw-r--r--packages/slugos-init/slugos-init_0.10.bb2
2 files changed, 4 insertions, 6 deletions
diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk
index 6077a92ffe..724dc3af5d 100644
--- a/packages/slugos-init/files/boot/disk
+++ b/packages/slugos-init/files/boot/disk
@@ -29,12 +29,10 @@ then
mount "$@" -U "$UUID" /mnt ||
mount "$@" "$device" /mnt
then
- # checkmount checks for sh, init and no
- # .recovery plus either mnt or initrd
- if checkmount /mnt && :>/mnt/.recovery
+ # checkmount checks for sh, chroot, init
+ # and /mnt (i.e. /mnt/mnt in this case)
+ if checkmount /mnt
then
- # sync to ensure .recovery is written
- sync
# pivot to /initrd if available, else /mnt
cd /
if test -d /mnt/initrd
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index 561f593560..7c4c21f521 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS = "busybox devio"
-PR = "r53"
+PR = "r54"
SRC_URI = "file://boot/flash \
file://boot/disk \