X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbase-files%2Fdefault%2Fsbin%2Fmount_root;h=c393e06f39c11ee71896f54f51fa69ec54b6f197;hb=777e76abb47dd74816ea063c471359b0db3aa2e7;hp=bc8d69c79baf1c352368bdc475e149cc7b259bd2;hpb=efbc756b232a92ad8176ed8cc3d37846939c8245;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 bc8d69c79..c393e06f3 100755
--- a/package/base-files/default/sbin/mount_root
+++ b/package/base-files/default/sbin/mount_root
@@ -1,10 +1,16 @@
 #!/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
 		if [ $(cat /proc/mtd | wc -l) = 6 ]; then
-			[ -f /proc/sys/diag ] && echo 5 > /proc/sys/diag
+			echo 5 > /proc/sys/diag
 			mtd unlock linux
 			mtd erase OpenWrt
 			jffs2root --move
@@ -13,7 +19,11 @@ if [ "$1" != "failsafe" ]; then
 			mount -o remount,rw /dev/root /
 		fi
 	else
-		if [ \! -x /usr/sbin/nvram -o -z "$(nvram get no_root_swap)" ]; then
+		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