From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 4 May 2005 14:35:13 +0000 (+0000)
Subject: add oleg's fix for jffs2 mounting
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/85fc1939a91db8e868cc5d10fc04216210ac62b8

add oleg's fix for jffs2 mounting


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@799 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/openwrt/target/default/target_skeleton/sbin/mount_root b/openwrt/target/default/target_skeleton/sbin/mount_root
index 5aec06212..7a8184745 100755
--- a/openwrt/target/default/target_skeleton/sbin/mount_root
+++ b/openwrt/target/default/target_skeleton/sbin/mount_root
@@ -2,14 +2,15 @@
 if [ "$1" != "failsafe" ]; then 
 	mount | grep jffs2 >&-
 	if [ $? = 0 ] ; then
-		[ $(cat /proc/mtd | wc -l) = 6 ] && {
+		if [ $(cat /proc/mtd | wc -l) = 6 ]; then
 			echo 5 > /proc/sys/diag
 			mtd unlock linux
 			mtd erase OpenWrt
 			jffs2root --move
-		} &
-		mtd unlock rootfs
-		mount -o remount,rw /dev/root /
+		else
+			mtd unlock rootfs
+			mount -o remount,rw /dev/root /
+		fi
 	else
 		mtd unlock OpenWrt
 		mount -t jffs2 /dev/mtdblock/4 /jffs