[backfire] merge r21511 - fix a preinit hang in jffs2_ready() when no rootfs_data...

[openwrt-10.03/.git] / package / base-files / files / lib / functions / boot.sh

diff --git a/package/base-files/files/lib/functions/boot.sh b/package/base-files/files/lib/functions/boot.sh
index 46b461330068e7bde52c41f3d69902f20f24113b..f93eec99a9f126fb53c890c34c619f4e5fb76243 100644 (file)
--- a/package/base-files/files/lib/functions/boot.sh
+++ b/package/base-files/files/lib/functions/boot.sh
@@ -2,6 +2,10 @@
 # Copyright (C) 2006-2010 OpenWrt.org
 # Copyright (C) 2010 Vertical Communications
 
+mount() {
+       /bin/busybox mount "$@"
+}
+
 boot_hook_add() {
        local hook="${1}_hook"
        local value="$2"
@@ -28,6 +32,7 @@ find_mtd_part() {
 
 jffs2_ready () {
     mtdpart="$(find_mtd_part rootfs_data)"
+    [ -z "$mtdpart" ] && return 1
     magic=$(hexdump $mtdpart -n 4 -e '4/1 "%02x"')
     [ "$magic" != "deadc0de" ]
 }
@@ -38,7 +43,7 @@ dupe() { # <new_root> <old_root>
        {
                cd $2 
                find . -xdev -type d
-               echo "./dev ./jffs ./mnt ./proc ./tmp"
+               echo "./dev ./overlay ./mnt ./proc ./tmp"
                # xdev skips mounted directories
                cd $1 
        } | xargs mkdir -p
@@ -65,7 +70,7 @@ pivot() { # <new_root> <old_root>
                mount -o move $2/dev /dev
                mount -o move $2/tmp /tmp
                mount -o move $2/sys /sys 2>&-
-               mount -o move $2/jffs /jffs 2>&-
+               mount -o move $2/overlay /overlay 2>&-
                return 0
        }
 }