X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/7619fe0848dc5f31d5c4c4cadd2ec067bd5c55d1..170b2b423d7d0430c0e181fbb66ff3d9ea4aac59:/package/base-files/default/sbin/mount_root

diff --git a/package/base-files/default/sbin/mount_root b/package/base-files/default/sbin/mount_root
index b4ec2ca56..c393e06f3 100755
--- a/package/base-files/default/sbin/mount_root
+++ b/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
@@ -12,12 +19,18 @@ if [ "$1" != "failsafe" ]; then
 			mount -o remount,rw /dev/root /
 		fi
 	else
-		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 >&-
+		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
+			mount none /proc -t proc
+			mount none /dev -t devfs
+			umount /rom/proc rom/dev >&-
+		fi
 	fi
 fi
 mount none /tmp -t tmpfs -o nosuid,nodev,mode=1777,size=50%