domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base-files: pass "force" parameter to the "sysupgrade" call

Browse Source 
This makes sysupgrade work with the most recent procd that validates
firmware before proceeding.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit b71962da16)
This commit is contained in:
Rafał Miłecki
2019-09-03 14:44:40 +02:00
committed by Jo-Philipp Wich
parent aa239ceaed
commit d7af175321
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package/base-files/files/sbin/sysupgrade
View File

@@ -360,9 +360,12 @@ if [ -n "$FAILSAFE" ]; then
printf '%s\x00%s\x00%s' "$RAM_ROOT" "$IMAGE" "$COMMAND" >/tmp/sysupgrade printf '%s\x00%s\x00%s' "$RAM_ROOT" "$IMAGE" "$COMMAND" >/tmp/sysupgrade
lock -u /tmp/.failsafe lock -u /tmp/.failsafe
else else
force_attr=""
[ $FORCE -eq 1 ] && force_attr="\"force\": true,"
ubus call system sysupgrade "{ ubus call system sysupgrade "{
\"prefix\": $(json_string "$RAM_ROOT"), \"prefix\": $(json_string "$RAM_ROOT"),
\"path\": $(json_string "$IMAGE"), \"path\": $(json_string "$IMAGE"),
$force_attr
\"command\": $(json_string "$COMMAND"), \"command\": $(json_string "$COMMAND"),
\"options\": { \"options\": {
\"save_config\": $SAVE_CONFIG, \"save_config\": $SAVE_CONFIG,