KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "base-files: fwtool: Fix wrong checksum on combined-image with metadata"

Browse source 
This reverts commit 41770add03.

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>
This commit is contained in:
Jo-Philipp Wich 2018-12-02 16:05:40 +01:00
parent 78ca6a5578
commit 9808bd2799
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/base-files/files/lib/upgrade/fwtool.sh
View file

@ -28,7 +28,7 @@ fwtool_check_image() {
. /usr/share/libubox/jshn.sh . /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" echo "Image metadata not found"
[ "$REQUIRE_IMAGE_METADATA" = 1 -a "$FORCE" != 1 ] && { [ "$REQUIRE_IMAGE_METADATA" = 1 -a "$FORCE" != 1 ] && {
echo "Use sysupgrade -F to override this check when downgrading or flashing to vendor firmware" echo "Use sysupgrade -F to override this check when downgrading or flashing to vendor firmware"