aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files/sbin
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-11-14 17:30:51 +0100
committerFelix Fietkau <nbd@nbd.name>2016-11-19 11:24:09 +0100
commitcc853810a4aae04f1afcad3439bf9db6fc1f4852 (patch)
treed653a4bcd195f6571df8d0d70e893df0978fc6ca /package/base-files/files/sbin
parent929641fa1fb23942581f64e6fa75ba87ba6111af (diff)
downloadupstream-cc853810a4aae04f1afcad3439bf9db6fc1f4852.tar.gz
upstream-cc853810a4aae04f1afcad3439bf9db6fc1f4852.tar.bz2
upstream-cc853810a4aae04f1afcad3439bf9db6fc1f4852.zip
base-files: validate metadata of sysupgrade images
Use fwtool to extract it, only require metadata to be present if the platform sysupgrade script sets REQUIRE_IMAGE_METADATA=1 Image metadata is in JSON format and contains a list of supported devices, along with version information that could be displayed by a UI later before the actual upgrade happens. Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/base-files/files/sbin')
-rwxr-xr-xpackage/base-files/files/sbin/sysupgrade3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 2f441f868b..c095ca81c5 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -128,7 +128,8 @@ add_overlayfiles() {
}
# hooks
-sysupgrade_image_check="platform_check_image"
+sysupgrade_image_check="fwtool_check_image platform_check_image"
+sysupgrade_pre_upgrade="fwtool_pre_upgrade"
[ $SAVE_OVERLAY = 0 -o ! -d /overlay/etc ] && \
sysupgrade_init_conffiles="add_uci_conffiles" || \
sysupgrade_init_conffiles="add_overlayfiles"