change 'ifnames' to 'ifname' in network config, fix #697

[openwrt.git] / package / base-files / brcm-2.6 / sbin / mount_root

diff --git a/package/base-files/brcm-2.6/sbin/mount_root b/package/base-files/brcm-2.6/sbin/mount_root
index 88a836c..e3bdd36 100755 (executable)
--- a/package/base-files/brcm-2.6/sbin/mount_root
+++ b/package/base-files/brcm-2.6/sbin/mount_root
@@ -1,4 +1,6 @@
 #!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
 is_dirty() {
        grep Broadcom /proc/cpuinfo >&- || return 1
        OFFSET="$(($(hexdump -v /dev/mtdblock/1 -s 20 -n 2 -e '"%d"')-1))"
@@ -12,12 +14,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