X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/18e309aa929423cace2216c5bcfa18fe4b15d7c2..5410980342c3522f4eb4a39cdee06fe9eec88b11:/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 29c5126ba..c393e06f3 100755 --- 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,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