From: Felix Fietkau Date: Sat, 22 Oct 2005 19:46:41 +0000 (+0000) Subject: add support for the 'dirty flag' in the boot scripts - a squashfs image will now... X-Git-Tag: whiterussian_rc4~88 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=89673e089e42346e900124f0bcb31ce8f9c5c473;p=openwrt%2Fsvn-archive%2Fopenwrt.git add support for the 'dirty flag' in the boot scripts - a squashfs image will now always clear the jffs2 part on the first boot after flashing SVN-Revision: 2254 --- diff --git a/openwrt/package/base-files/default/sbin/mount_root b/openwrt/package/base-files/default/sbin/mount_root index 29c5126ba1..7bcf80c6f1 100755 --- a/openwrt/package/base-files/default/sbin/mount_root +++ b/openwrt/package/base-files/default/sbin/mount_root @@ -1,4 +1,9 @@ #!/bin/sh +is_clean() { + 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 +18,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