X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fbase-files%2Flib%2Fupgrade%2Fplatform.sh;h=923e02b9fc01549330941a10bc0f15ccc7ab69be;hp=1d3695f372f022266429eb0122d7a51d2ef7c285;hb=461595235558bfb0dd748532af26ade8bcce89b5;hpb=bf897a99744c5268607b2f9f54188a784810da0e diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 1d3695f372..923e02b9fc 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -66,6 +66,10 @@ tplink_get_image_hwid() { get_image "$@" | dd bs=4 count=1 skip=16 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"' } +tplink_get_image_mid() { + get_image "$@" | dd bs=4 count=1 skip=17 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"' +} + tplink_get_image_boot_size() { get_image "$@" | dd bs=4 count=1 skip=37 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"' } @@ -396,13 +400,17 @@ platform_check_image() { } local hwid - local imageid + local mid + local imagehwid + local imagemid hwid=$(tplink_get_hwid) - imageid=$(tplink_get_image_hwid "$1") + mid=$(tplink_get_mid) + imagehwid=$(tplink_get_image_hwid "$1") + imagemid=$(tplink_get_image_mid "$1") - [ "$hwid" != "$imageid" ] && { - echo "Invalid image, hardware ID mismatch, hw:$hwid image:$imageid." + [ "$hwid" != "$imagehwid" -o "$mid" != "$imagemid" ] && { + echo "Invalid image, hardware ID mismatch, hw:$hwid $mid image:$imagehwid $imagemid." return 1 }