X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbase-files%2Fdefault%2Fsbin%2Fmount_root;h=c393e06f39c11ee71896f54f51fa69ec54b6f197;hb=777e76abb47dd74816ea063c471359b0db3aa2e7;hp=ae78ee4881a14120299e6a8ec5021419a5008e9d;hpb=6dc988729c78347c590675fe4bfdb9bb408fffc7;p=openwrt-10.03%2F.git

diff --git a/package/base-files/default/sbin/mount_root b/package/base-files/default/sbin/mount_root
index ae78ee488..c393e06f3 100755
--- a/package/base-files/default/sbin/mount_root
+++ b/package/base-files/default/sbin/mount_root
@@ -1,5 +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
@@ -14,6 +20,10 @@ if [ "$1" != "failsafe" ]; then
 		fi
 	else
 		if [ -z "$(nvram get no_root_swap)" ]; then
+			is_clean || {
+				mtd erase OpenWrt
+				jffs2root --clean
+			}
 			mtd unlock OpenWrt
 			mount -t jffs2 /dev/mtdblock/4 /jffs
 			pivot_root /jffs /jffs/rom