dir-825-b1: Fix wholeflash images: Attempting to flash a wholeflash (-openwrt) image...

[openwrt/staging/noltari.git] / target / linux / ar71xx / base-files / etc / uci-defaults / caldata-migration

diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/caldata-migration b/target/linux/ar71xx/base-files/etc/uci-defaults/caldata-migration
index 750ff405d339faa342ccd425602367c4f9c5137b..486e4ed7b8c7ab896fd20ae5c38bd4acf1981386 100644 (file)
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/caldata-migration
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/caldata-migration
@@ -44,12 +44,13 @@ getifmac() {
 }
 
 case "$board" in
-dir-825-b1)
+dir-825-b1-towholeflash)
        mac1="$(getcalmac caldata 65440)"
        mac1="$(calcmacX "$mac1" 2)"
        mac2="$(calcmacX "$mac1" 1)"
 
        if grep -q '"owrt_caldata"' /proc/mtd && [ "$mac1" = "$(getifmac eth0)" ] && [ "$mac2" = "$(getifmac eth1)" ]; then
+               mtd erase owrt_caldata
                dd if=/dev/$(findmtd caldata) of=/dev/$(findmtd owrt_caldata) bs=65536 count=1
        fi
        ;;
@@ -58,6 +59,7 @@ dir-825-b1-tostock)
        mac1="$(calcmacX "$mac1" 2)"
        mac2="$(calcmacX "$mac1" 1)"
        if grep -q '"owrt_caldata"' /proc/mtd && [ "$mac1" = "$(getifmac eth0)" ] && [ "$mac2" = "$(getifmac eth1)" ]; then
+               mtd erase caldata
                dd if=/dev/$(findmtd owrt_caldata) of=/dev/$(findmtd caldata) bs=65536 count=1
        fi
        ;;