aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-07-09 19:34:09 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-07-31 11:40:15 +0200
commitad3e1f9db4cffaec6700d780308fb6241c09a96f (patch)
tree02a199495613dbc2ea23faaf9bef86f71f9c66ec /package
parent735de53b2aae9be03611715699bf58dff44e8eff (diff)
downloadupstream-ad3e1f9db4cffaec6700d780308fb6241c09a96f.tar.gz
upstream-ad3e1f9db4cffaec6700d780308fb6241c09a96f.tar.bz2
upstream-ad3e1f9db4cffaec6700d780308fb6241c09a96f.zip
base-files: fwtool: implement compatibility check for images
We regularly encounter the situation that devices are subject to changes that will make them incompatible to previous versions. Removing SUPPORTED_DEVICES will not really be helpful in most of these cases, as this only helps after a rename. To solve this situation, this patchset introduces a compatibility version for devices. In this patch, the actual checks are implemented into fwtool_check_image(): If an incompatible change is introduced, one can increase either the minor version (1.0->1.1) or the major version (1.0->2.0). Minor version increment: This will still allow sysupgrade, but require to reset config (-n or SAVE_CONFIG=0). If sysupgrade is called without -n, a corresponding message will be printed. If sysupgrade is called with -n, it will just pass, with supported devices being checked as usual. (Which will allow us to add back SUPPORTED_DEVICES for many cases.) Major version increment: This is meant for potential (rare) cases where sysupgrade is not possible at all, because it would break the device. In this case, a warning will be printed, and -n won't help. If image check fails because of one of the versions parts not matching, the content of DEVICE_COMPAT_MESSAGE is printed in addition to the generic message (if set). For both cases, upgrade can still be forced with -F as usual. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'package')
-rw-r--r--package/base-files/files/lib/upgrade/fwtool.sh24
1 files changed, 23 insertions, 1 deletions
diff --git a/package/base-files/files/lib/upgrade/fwtool.sh b/package/base-files/files/lib/upgrade/fwtool.sh
index a0b3fb0a04..e8277f6fcc 100644
--- a/package/base-files/files/lib/upgrade/fwtool.sh
+++ b/package/base-files/files/lib/upgrade/fwtool.sh
@@ -44,13 +44,35 @@ fwtool_check_image() {
}
device="$(cat /tmp/sysinfo/board_name)"
+ devicecompat="$(uci -q get system.@system[0].compat_version)"
+ [ -n "$devicecompat" ] || devicecompat="1.0"
+
+ json_get_var imagecompat compat_version
+ json_get_var compatmessage compat_message
+ [ -n "$imagecompat" ] || imagecompat="1.0"
json_select supported_devices || return 1
json_get_keys dev_keys
for k in $dev_keys; do
json_get_var dev "$k"
- [ "$dev" = "$device" ] && return 0
+ if [ "$dev" = "$device" ]; then
+ # major compat version -> no sysupgrade
+ if [ "${devicecompat%.*}" != "${imagecompat%.*}" ]; then
+ echo "The device is supported, but this image is incompatible for sysupgrade based on the image version ($devicecompat->$imagecompat)."
+ [ -n "$compatmessage" ] && echo "$compatmessage"
+ return 1
+ fi
+
+ # minor compat version -> sysupgrade with -n required
+ if [ "${devicecompat#.*}" != "${imagecompat#.*}" ] && [ "$SAVE_CONFIG" = "1" ]; then
+ echo "The device is supported, but the config is incompatible to the new image ($devicecompat->$imagecompat). Please upgrade without keeping config (sysupgrade -n)."
+ [ -n "$compatmessage" ] && echo "$compatmessage"
+ return 1
+ fi
+
+ return 0
+ fi
done
echo "Device $device not supported by this image"