Update to new upstream release (v2.2.0)

[openwrt.git] / openwrt / target / default / target_skeleton / sbin / mount_root

diff --git a/openwrt/target/default/target_skeleton/sbin/mount_root b/openwrt/target/default/target_skeleton/sbin/mount_root
index 5aec062..eef55b4 100755 (executable)
--- a/openwrt/target/default/target_skeleton/sbin/mount_root
+++ b/openwrt/target/default/target_skeleton/sbin/mount_root
@@ -2,21 +2,22 @@
 if [ "$1" != "failsafe" ]; then 
        mount | grep jffs2 >&-
        if [ $? = 0 ] ; then
 if [ "$1" != "failsafe" ]; then 
        mount | grep jffs2 >&-
        if [ $? = 0 ] ; then

-               [ $(cat /proc/mtd | wc -l) = 6 ] && {
+               if [ $(cat /proc/mtd | wc -l) = 6 ]; then

                        echo 5 > /proc/sys/diag
                        mtd unlock linux
                        mtd erase OpenWrt
                        jffs2root --move
                        echo 5 > /proc/sys/diag
                        mtd unlock linux
                        mtd erase OpenWrt
                        jffs2root --move

-               } &
-               mtd unlock rootfs
-               mount -o remount,rw /dev/root /
+               else
+                       mtd unlock rootfs
+                       mount -o remount,rw /dev/root /
+               fi

        else
                mtd unlock OpenWrt
                mount -t jffs2 /dev/mtdblock/4 /jffs
                pivot_root /jffs /jffs/rom
                mount none /proc -t proc
                mount none /dev -t devfs
        else
                mtd unlock OpenWrt
                mount -t jffs2 /dev/mtdblock/4 /jffs
                pivot_root /jffs /jffs/rom
                mount none /proc -t proc
                mount none /dev -t devfs

-               umount rom/proc rom/dev
+               umount /rom/proc rom/dev >&-

        fi
 fi
 mount none /tmp -t tmpfs size=50%
        fi
 fi
 mount none /tmp -t tmpfs size=50%