From: Rafał Miłecki <rafal@milecki.pl>
Date: Tue, 3 Sep 2019 12:44:40 +0000 (+0200)
Subject: base-files: pass "force" parameter to the "sysupgrade" call
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=b71962da16c2e2b93d633d7bde1436b3da2bf740;p=openwrt%2Fstaging%2Frmilecki.git

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>
---

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 42f0f6bd22e..f106c3c9818 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,