summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2006-02-05 22:23:12 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-02-05 22:23:12 +0000
commitf4156198b0d0399792402508b2d0854f106765b0 (patch)
tree7c050ea870851ef17d588868cb9995d04beea21e
parentc01da5afd0487e11fb2a17ad3b7c8c423ee05039 (diff)
parent9fc42a7dd92e6104ab7c4077507d93d35be7bf95 (diff)
merge of 46db27fa739a4e4dbc48014380db5c6d2cbde37f
and eedeac9741d0ad1da70a5545c21f0803a63bf9f0
-rw-r--r--packages/slugos-init/files/boot/disk8
1 files changed, 3 insertions, 5 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