Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

base-files: sysupgrade: pass "backup" ubus attribute

Browse source 
This explicitly tells procd what backup file should be used during
sysupgrade (if any). It's much more generic this way compared to the
magic /tmp/sysupgrade.tgz file that had to be created before a call.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki 2019-09-06 07:10:52 +02:00
parent 6d819fae53
commit c5223b26a4
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -362,10 +362,13 @@ if [ -n "$FAILSAFE" ]; then
else else
force_attr="" force_attr=""
[ $FORCE -eq 1 ] && force_attr="\"force\": true," [ $FORCE -eq 1 ] && force_attr="\"force\": true,"
backup_attr=""
[ $SAVE_CONFIG -eq 1 ] && backup_attr="\"backup\": $(json_string $CONF_TAR),"
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 $force_attr
$backup_attr
\"command\": $(json_string "$COMMAND"), \"command\": $(json_string "$COMMAND"),
\"options\": { \"options\": {
\"save_config\": $SAVE_CONFIG, \"save_config\": $SAVE_CONFIG,