X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d60212649f655885fbc3733a1c0fcee797a958fc..82dc56f60fd4977584a3666c2e4c15042f23b06d:/target/default/target_skeleton/sbin/mount_root

diff --git a/target/default/target_skeleton/sbin/mount_root b/target/default/target_skeleton/sbin/mount_root
index 5aec06212..eef55b4bd 100755
--- a/target/default/target_skeleton/sbin/mount_root
+++ b/target/default/target_skeleton/sbin/mount_root
@@ -2,21 +2,22 @@
 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
 		pivot_root /jffs /jffs/rom
 		mount none /proc -t proc
 		mount none /dev -t devfs
-		umount rom/proc rom/dev
+		umount /rom/proc rom/dev >&-
 	fi
 fi
 mount none /tmp -t tmpfs size=50%