From: Mike Baker <mbm@openwrt.org>
Date: Sun, 13 May 2007 09:39:21 +0000 (+0000)
Subject: clean up the mtd unlocking
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e4c6078c6788530bc88eb6790e70d5a5b363a344;p=openwrt%2Fstaging%2Fjow.git

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 2006f0128e..a77a7f6453 100755
--- a/package/base-files/files/sbin/mount_root
+++ b/package/base-files/files/sbin/mount_root
@@ -41,18 +41,19 @@ jffs2_ready () {
 }
 
 [ 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
-			} || {
-				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 /
+	}
 }