revert bad firewall patch

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

diff --git a/openwrt/package/base-files/default/sbin/mount_root b/openwrt/package/base-files/default/sbin/mount_root
index 29c5126..bd9b815 100755 (executable)
--- a/openwrt/package/base-files/default/sbin/mount_root
+++ b/openwrt/package/base-files/default/sbin/mount_root
@@ -1,4 +1,11 @@
 #!/bin/sh
+. /etc/nvram.sh
+is_clean() {
+       grep Broadcom /proc/cpuinfo 2>&- >&- || return 0
+       OFFSET="$((0x$(dd if=/dev/mtdblock/1 bs=1 skip=$((0x14)) count=2 2>&- | hexdump | grep 0000000 | cut -d ' ' -f 2) - 1))"
+       dd if=/dev/mtdblock/1 bs=1 skip=$OFFSET count=1 2>&- | hexdump -v | grep ' 0000' > /dev/null && return 255 || return 0
+}
+
 if [ "$1" != "failsafe" ]; then 
        mount | grep jffs2 >&-
        if [ $? = 0 ] ; then
@@ -13,12 +20,17 @@ if [ "$1" != "failsafe" ]; then
                fi
        else
                if [ -z "$(nvram get no_root_swap)" ]; then
+                       is_clean || {
+                               mtd erase OpenWrt
+                               mtd unlock linux
+                               jffs2root --clean
+                       }
                        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
 fi