remove redundant unlocks

SVN-Revision: 620
This commit is contained in:
Mike Baker 2005-04-11 00:28:07 +00:00
parent 47e29c53bd
commit 5524be79bd

View file

@ -2,17 +2,16 @@
if [ "$1" != "failsafe" ]; then if [ "$1" != "failsafe" ]; then
mount | grep jffs2 >&- mount | grep jffs2 >&-
if [ $? = 0 ] ; then if [ $? = 0 ] ; then
mtd unlock linux
mtd unlock rootfs
[ $(cat /proc/mtd | wc -l) = 6 ] && { [ $(cat /proc/mtd | wc -l) = 6 ] && {
echo 5 > /proc/sys/diag echo 5 > /proc/sys/diag
mtd unlock OpenWrt mtd unlock linux
mtd erase OpenWrt mtd erase OpenWrt
jffs2root --move jffs2root --move
} }
mtd unlock rootfs
mount -o remount,rw /dev/root / mount -o remount,rw /dev/root /
else else
mtd unlock mtd4 mtd unlock OpenWrt
mount -t jffs2 /dev/mtdblock/4 /jffs mount -t jffs2 /dev/mtdblock/4 /jffs
pivot_root /jffs /jffs/rom pivot_root /jffs /jffs/rom
mount none /proc -t proc mount none /proc -t proc