clean up the mtd unlocking

SVN-Revision: 7199

diff --git a/package/base-files/files/sbin/mount_root b/package/base-files/files/sbin/mount_root
index 2006f0128e86d4aa4e8c133df3637dbedc7f4ef6..a77a7f645311b70966e15ac7b6e701e5b3a1b7cc 100755 (executable)
--- a/package/base-files/files/sbin/mount_root
+++ b/package/base-files/files/sbin/mount_root
@@ -41,18 +41,19 @@ jffs2_ready () {
 }
 
 [ failsafe != "$1" ] && {
 }
 
 [ failsafe != "$1" ] && {

-       grep rootfs /proc/mtd >/dev/null 2>/dev/null && {
-               mtd unlock rootfs
-               grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && {
-                       . /bin/firstboot
-                       jffs2_ready && {
-                               echo "switching to jffs2"
-                               mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2 && \
+       grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && {
+               . /bin/firstboot
+               mtd unlock rootfs_data
+               jffs2_ready && {
+                       echo "switching to jffs2"
+                       mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2 && \

                                fopivot /jffs /rom
                                fopivot /jffs /rom

-                       } || {
-                               echo "jffs2 not ready yet; using ramdisk"
-                               ramoverlay
-                       }
+               } || {
+                       echo "jffs2 not ready yet; using ramdisk"
+                       ramoverlay

                }
                }

-       } || mount -o remount,rw /dev/root /
+       } || {
+               mtd unlock rootfs
+               mount -o remount,rw /dev/root /
+       }

 }
 }