diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2019-09-05 23:33:19 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2019-09-05 23:33:19 +0200 |
| commit | 641f6b6c26cb9ab5e1198810015e5f4b2b5b34ad (patch) | |
| tree | ce9f2a79a4311a97410fc74d78bfe61f201a8eac /package/base-files/files/lib/upgrade | |
| parent | e8dcbbc865cb6acef1cfbafe77f30c1f003c3dc3 (diff) | |
| download | upstream-641f6b6c26cb9ab5e1198810015e5f4b2b5b34ad.tar.gz upstream-641f6b6c26cb9ab5e1198810015e5f4b2b5b34ad.tar.bz2 upstream-641f6b6c26cb9ab5e1198810015e5f4b2b5b34ad.zip | |
treewide: use new procd sysupgrade $UPGRADE_BACKUP variable
It's a variable set by procd that should replace hardcoded
/tmp/sysupgrade.tgz.
This change requires the most recent procd with the commit 0f3c136
("sysupgrade: set UPGRADE_BACKUP env variable").
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'package/base-files/files/lib/upgrade')
| -rw-r--r-- | package/base-files/files/lib/upgrade/common.sh | 2 | ||||
| -rwxr-xr-x | package/base-files/files/lib/upgrade/stage2 | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 279470fcd8..8e7866f698 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -221,7 +221,7 @@ indicate_upgrade() { default_do_upgrade() { sync if [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ]; then - get_image "$1" "$2" | mtd $MTD_ARGS $MTD_CONFIG_ARGS -j "$CONF_TAR" write - "${PART_NAME:-image}" + 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}" fi diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2 index ff2a9aee05..5d3d46ee80 100755 --- a/package/base-files/files/lib/upgrade/stage2 +++ b/package/base-files/files/lib/upgrade/stage2 @@ -9,7 +9,6 @@ COMMAND="$2" export INTERACTIVE=0 export VERBOSE=1 export CONFFILES=/tmp/sysupgrade.conffiles -export CONF_TAR=/tmp/sysupgrade.tgz RAMFS_COPY_BIN= # extra programs for temporary ramfs root RAMFS_COPY_DATA= # extra data files |