From d7af17532193ad3650f489c2b38d94630c79f936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Tue, 3 Sep 2019 14:44:40 +0200 Subject: [PATCH] base-files: pass "force" parameter to the "sysupgrade" call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes sysupgrade work with the most recent procd that validates firmware before proceeding. Signed-off-by: Rafał Miłecki (cherry picked from commit b71962da16c2e2b93d633d7bde1436b3da2bf740) --- package/base-files/files/sbin/sysupgrade | 3 +++ 1 file changed, 3 insertions(+) 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,