projects
/
openwrt
/
staging
/
nbd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7ebbbda
)
base-files: do not strip fwtool signature data during check
author
Felix Fietkau
<nbd@nbd.name>
Sat, 9 Feb 2019 13:34:12 +0000
(14:34 +0100)
committer
Felix Fietkau
<nbd@nbd.name>
Sat, 9 Feb 2019 13:34:24 +0000
(14:34 +0100)
Same reason as in commit
9808bd279927bcd2d3a78d19a55229b93bbbcf05
-
sysupgrade --test must not alter the image in any way
Signed-off-by: Felix Fietkau <nbd@nbd.name>
package/base-files/files/lib/upgrade/fwtool.sh
patch
|
blob
|
history
diff --git
a/package/base-files/files/lib/upgrade/fwtool.sh
b/package/base-files/files/lib/upgrade/fwtool.sh
index 3f28fccd904dc0ae1019ad31ad11b5a1c220b905..6d7300bad632c76e9d24a4c227a9734b7ad55aac 100644
(file)
--- 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"