remove redundant unlocks

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@620 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/default/target_skeleton/sbin/mount_root b/target/default/target_skeleton/sbin/mount_root
index b15d6b9e7cc1b2790ecbb951a52319011627567d..06d8b85631ca00dcf537f339c3536231380fda9e 100755 (executable)
--- a/target/default/target_skeleton/sbin/mount_root
+++ b/target/default/target_skeleton/sbin/mount_root
@@ -2,17 +2,16 @@
 if [ "$1" != "failsafe" ]; then 
        mount | grep jffs2 >&-
        if [ $? = 0 ] ; then
-               mtd unlock linux
-               mtd unlock rootfs
                [ $(cat /proc/mtd | wc -l) = 6 ] && {
                        echo 5 > /proc/sys/diag
-                       mtd unlock OpenWrt
+                       mtd unlock linux
                        mtd erase OpenWrt
                        jffs2root --move
                }
+               mtd unlock rootfs
                mount -o remount,rw /dev/root /
        else
-               mtd unlock mtd4
+               mtd unlock OpenWrt
                mount -t jffs2 /dev/mtdblock/4 /jffs
                pivot_root /jffs /jffs/rom
                mount none /proc -t proc