aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2018-12-02 16:05:40 +0100
committerJo-Philipp Wich <jo@mein.io>2018-12-02 16:05:44 +0100
commit9808bd279927bcd2d3a78d19a55229b93bbbcf05 (patch)
tree35ce215ec482e1b68014db17cb49283addb176e4
parent78ca6a5578d6c7b06ca520b0aac965a1babf5417 (diff)
downloadupstream-9808bd279927bcd2d3a78d19a55229b93bbbcf05.tar.gz
upstream-9808bd279927bcd2d3a78d19a55229b93bbbcf05.tar.bz2
upstream-9808bd279927bcd2d3a78d19a55229b93bbbcf05.zip
Revert "base-files: fwtool: Fix wrong checksum on combined-image with metadata"
This reverts commit 41770add03ad77a0ce41ed424ad050238f7d9272. The fwtool_check_image() procedure is used by `sysupgrade --test` which must not alter the image under test in any way. Currently, when the LuCI ui or any other sysupgrade wrapper first invokes sysupgrade --test to verify the compatibility of the image and then calculates the sha256sum over it, the resulting checksum will differ from the original image since the test invocation will implicitely strip the metadata trailer. To properly fix the underlying issue, the combined image checksumming code must be modified to skip the metadata trailer. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-rw-r--r--package/base-files/files/lib/upgrade/fwtool.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/base-files/files/lib/upgrade/fwtool.sh b/package/base-files/files/lib/upgrade/fwtool.sh
index e0e5c96c89..3f28fccd90 100644
--- a/package/base-files/files/lib/upgrade/fwtool.sh
+++ b/package/base-files/files/lib/upgrade/fwtool.sh
@@ -28,7 +28,7 @@ fwtool_check_image() {
. /usr/share/libubox/jshn.sh
- if ! fwtool -q -t -i /tmp/sysupgrade.meta "$1"; then
+ if ! fwtool -q -i /tmp/sysupgrade.meta "$1"; then
echo "Image metadata not found"
[ "$REQUIRE_IMAGE_METADATA" = 1 -a "$FORCE" != 1 ] && {
echo "Use sysupgrade -F to override this check when downgrading or flashing to vendor firmware"