diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2019-09-06 07:10:54 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2019-09-16 05:57:08 +0200 |
| commit | c53a0ed5e38d254ed15a447bfb8fbcd2c4a3bda5 (patch) | |
| tree | b2c4f9b8a3e5d1232c9c7e297c343e76174bd86b /package | |
| parent | f69b855a7580f6d5ec411f16fdeb4d1b11884d2c (diff) | |
| download | upstream-c53a0ed5e38d254ed15a447bfb8fbcd2c4a3bda5.tar.gz upstream-c53a0ed5e38d254ed15a447bfb8fbcd2c4a3bda5.tar.bz2 upstream-c53a0ed5e38d254ed15a447bfb8fbcd2c4a3bda5.zip | |
treewide: sysupgrade: use $UPGRADE_BACKUP to check for backup
Now that $UPGRADE_BACKUP is set conditionally there is no need to check
the $UPGRADE_OPT_SAVE_CONFIG anymore. All conditions can be simplified.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit a858db313687ddfa6ed1ddba76bd74844a7b89dc)
Diffstat (limited to 'package')
| -rw-r--r-- | package/base-files/files/lib/upgrade/common.sh | 2 | ||||
| -rwxr-xr-x | package/base-files/files/lib/upgrade/do_stage2 | 2 | ||||
| -rwxr-xr-x | package/base-files/files/sbin/sysupgrade | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 8e7866f698..0d3162d4fc 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -220,7 +220,7 @@ indicate_upgrade() { # $(2): (optional) pipe command to extract firmware, e.g. dd bs=n skip=m default_do_upgrade() { sync - if [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ]; then + if [ -n "$UPGRADE_BACKUP" ]; then get_image "$1" "$2" | mtd $MTD_ARGS $MTD_CONFIG_ARGS -j "$UPGRADE_BACKUP" write - "${PART_NAME:-image}" else get_image "$1" "$2" | mtd $MTD_ARGS write - "${PART_NAME:-image}" diff --git a/package/base-files/files/lib/upgrade/do_stage2 b/package/base-files/files/lib/upgrade/do_stage2 index 0e6cc1bfc3..0e32445743 100755 --- a/package/base-files/files/lib/upgrade/do_stage2 +++ b/package/base-files/files/lib/upgrade/do_stage2 @@ -11,7 +11,7 @@ else default_do_upgrade "$IMAGE" fi -if [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && type 'platform_copy_config' >/dev/null 2>/dev/null; then +if [ -n "$UPGRADE_BACKUP" ] && type 'platform_copy_config' >/dev/null 2>/dev/null; then platform_copy_config fi diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index f18143bff4..935d08048e 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -371,7 +371,6 @@ else $backup_attr \"command\": $(json_string "$COMMAND"), \"options\": { - \"save_config\": $SAVE_CONFIG, \"save_partitions\": $SAVE_PARTITIONS } }" |