From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 4 May 2005 14:35:13 +0000 (+0000)
Subject: add oleg's fix for jffs2 mounting
X-Git-Tag: reboot~32914
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6bca05dcc2fa99c94075b112d178d3f525dcbca7;p=openwrt%2Fstaging%2Fjogo.git

add oleg's fix for jffs2 mounting

SVN-Revision: 799
---

diff --git a/openwrt/target/default/target_skeleton/sbin/mount_root b/openwrt/target/default/target_skeleton/sbin/mount_root
index 5aec062125..7a8184745d 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