aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2019-09-03 14:44:40 +0200
committerRafał Miłecki <rafal@milecki.pl>2019-09-04 11:07:41 +0200
commitb71962da16c2e2b93d633d7bde1436b3da2bf740 (patch)
treef3619f2c8172b9d75824f82e6efe161532bf21c9
parente68c1cebd1d87ce60f0646688e437e83081e2322 (diff)
downloadupstream-b71962da16c2e2b93d633d7bde1436b3da2bf740.tar.gz
upstream-b71962da16c2e2b93d633d7bde1436b3da2bf740.tar.bz2
upstream-b71962da16c2e2b93d633d7bde1436b3da2bf740.zip
base-files: pass "force" parameter to the "sysupgrade" call
This makes sysupgrade work with the most recent procd that validates firmware before proceeding. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-rwxr-xr-xpackage/base-files/files/sbin/sysupgrade3
1 files changed, 3 insertions, 0 deletions
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 42f0f6bd22..f106c3c981 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -360,9 +360,12 @@ if [ -n "$FAILSAFE" ]; then
printf '%s\x00%s\x00%s' "$RAM_ROOT" "$IMAGE" "$COMMAND" >/tmp/sysupgrade
lock -u /tmp/.failsafe
else
+ force_attr=""
+ [ $FORCE -eq 1 ] && force_attr="\"force\": true,"
ubus call system sysupgrade "{
\"prefix\": $(json_string "$RAM_ROOT"),
\"path\": $(json_string "$IMAGE"),
+ $force_attr
\"command\": $(json_string "$COMMAND"),
\"options\": {
\"save_config\": $SAVE_CONFIG,