X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/6f038752364538d052dfc3571242f8e0830b5106..decb367de9b732d2da8b17eec3986fc8ecbdbc66:/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 32a6ee548..427ff0444 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
@@ -14,15 +20,21 @@ 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
 mount none /tmp -t tmpfs -o nosuid,nodev,mode=1777,size=50%
 mkdir -p /dev/pts
 mount none /dev/pts -t devpts
+grep sysfs /proc/filesystems >&- && mount -t sysfs none /sys