From: Mike Baker <mbm@openwrt.org>
Date: Mon, 11 Apr 2005 00:28:07 +0000 (+0000)
Subject: remove redundant unlocks
X-Git-Tag: reboot~33092
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5524be79bd8277ab69ca3943acf46b6a0f1006bf;p=oweals%2Fopenwrt.git

remove redundant unlocks

SVN-Revision: 620
---

diff --git a/openwrt/target/default/target_skeleton/sbin/mount_root b/openwrt/target/default/target_skeleton/sbin/mount_root
index b15d6b9e7c..06d8b85631 100755
--- a/openwrt/target/default/target_skeleton/sbin/mount_root
+++ b/openwrt/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