add oleg's fix for jffs2 mounting
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Wed, 4 May 2005 14:35:13 +0000 (14:35 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Wed, 4 May 2005 14:35:13 +0000 (14:35 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@799 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/default/target_skeleton/sbin/mount_root

index 5aec062..7a81847 100755 (executable)
@@ -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