summaryrefslogtreecommitdiffstats
path: root/target/default/target_skeleton/sbin
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-04-11 00:28:07 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-04-11 00:28:07 +0000
commitb92543d7b95297eebb3bf48632ed7030b556fb6d (patch)
treefe781b87df0db2fe2452a270f54b7a98b754269b /target/default/target_skeleton/sbin
parentf607fc5b491fe75f22d2fac4631574aa3ca80e27 (diff)
remove redundant unlocks
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@620 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/default/target_skeleton/sbin')
-rwxr-xr-xtarget/default/target_skeleton/sbin/mount_root7
1 files changed, 3 insertions, 4 deletions
diff --git a/target/default/target_skeleton/sbin/mount_root b/target/default/target_skeleton/sbin/mount_root
index b15d6b9e7..06d8b8563 100755
--- 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