From: Felix Fietkau <nbd@nbd.name>
Date: Sat, 9 Feb 2019 13:34:12 +0000 (+0100)
Subject: base-files: do not strip fwtool signature data during check
X-Git-Tag: v19.07.0-rc1~1362
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=61e01f248eb22ea9a4cffa862218f47970f3ab2c;p=openwrt%2Fopenwrt.git

base-files: do not strip fwtool signature data during check

Same reason as in commit 9808bd279927bcd2d3a78d19a55229b93bbbcf05 -
sysupgrade --test must not alter the image in any way

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/base-files/files/lib/upgrade/fwtool.sh b/package/base-files/files/lib/upgrade/fwtool.sh
index 3f28fccd90..6d7300bad6 100644
--- a/package/base-files/files/lib/upgrade/fwtool.sh
+++ b/package/base-files/files/lib/upgrade/fwtool.sh
@@ -9,7 +9,7 @@ fwtool_check_signature() {
 		fi
 	}
 
-	if ! fwtool -q -t -s /tmp/sysupgrade.ucert "$1"; then
+	if ! fwtool -q -s /tmp/sysupgrade.ucert "$1"; then
 		echo "Image signature not found"
 		[ "$REQUIRE_IMAGE_SIGNATURE" = 1 -a "$FORCE" != 1 ] && {
 			echo "Use sysupgrade -F to override this check when downgrading or flashing to vendor firmware"