nuke jffs2root --move from init scripts

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4063 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/brcm-2.4/sbin/mount_root b/package/base-files/brcm-2.4/sbin/mount_root
index 88a836c..8edac78 100755 (executable)
--- a/package/base-files/brcm-2.4/sbin/mount_root
+++ b/package/base-files/brcm-2.4/sbin/mount_root
@@ -12,12 +12,7 @@ if [ "$1" != "failsafe" ]; then
        mtd unlock linux
        mount | grep jffs2 >&-
        if [ $? = 0 ] ; then
-               if [ $(cat /proc/mtd | wc -l) = 6 ]; then
-                       mtd erase OpenWrt
-                       jffs2root --move
-               else
-                       mount -o remount,rw /dev/root /
-               fi
+               mount -o remount,rw /dev/root /
        else
                . /bin/firstboot
                is_dirty 
@@ -35,4 +30,3 @@ fi
 mount none /tmp -t tmpfs -o remount,nosuid,nodev,mode=1777
 mkdir -p /dev/pts
 mount none /dev/pts -t devpts
-mount -t sysfs none /sys 2>&-

diff --git a/package/base-files/brcm-2.6/sbin/mount_root b/package/base-files/brcm-2.6/sbin/mount_root
index 88a836c..a3ada58 100755 (executable)
--- a/package/base-files/brcm-2.6/sbin/mount_root
+++ b/package/base-files/brcm-2.6/sbin/mount_root
@@ -12,12 +12,7 @@ if [ "$1" != "failsafe" ]; then
        mtd unlock linux
        mount | grep jffs2 >&-
        if [ $? = 0 ] ; then
-               if [ $(cat /proc/mtd | wc -l) = 6 ]; then
-                       mtd erase OpenWrt
-                       jffs2root --move
-               else
-                       mount -o remount,rw /dev/root /
-               fi
+               mount -o remount,rw /dev/root /
        else
                . /bin/firstboot
                is_dirty