base-files: fwtool: make compat_version backward compatible

[openwrt/staging/chunkeey.git] / package / base-files / files / lib / upgrade / fwtool.sh

diff --git a/package/base-files/files/lib/upgrade/fwtool.sh b/package/base-files/files/lib/upgrade/fwtool.sh
index e8277f6fccc8fdc3c93aa770ffe0b153f11b22c0..3a74c72bba74d8c282eecd6b11cad52e52dfe899 100644 (file)
--- a/package/base-files/files/lib/upgrade/fwtool.sh
+++ b/package/base-files/files/lib/upgrade/fwtool.sh
@@ -51,7 +51,12 @@ fwtool_check_image() {
        json_get_var compatmessage compat_message
        [ -n "$imagecompat" ] || imagecompat="1.0"
 
-       json_select supported_devices || return 1
+       # select correct supported list based on compat_version
+       # (using this ensures that compatibility check works for devices
+       #  not knowing about compat-version)
+       local supported=supported_devices
+       [ "$imagecompat" != "1.0" ] && supported=new_supported_devices
+       json_select $supported || return 1
 
        json_get_keys dev_keys
        for k in $dev_keys; do