aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2019-09-05 23:33:19 +0200
committerRafał Miłecki <rafal@milecki.pl>2019-09-12 13:27:29 +0200
commita717428828558577760abfcf83a54e3d7459ee0b (patch)
tree40460adc1ed60cf2ab8762a3cd7df3dead0015f4 /package/base-files/files
parent1b9a4f0cb48acb91a8765d1d8715077b9846e39e (diff)
downloadupstream-a717428828558577760abfcf83a54e3d7459ee0b.tar.gz
upstream-a717428828558577760abfcf83a54e3d7459ee0b.tar.bz2
upstream-a717428828558577760abfcf83a54e3d7459ee0b.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> (cherry picked from commit 641f6b6c26cb9ab5e1198810015e5f4b2b5b34ad)
Diffstat (limited to 'package/base-files/files')
-rw-r--r--package/base-files/files/lib/upgrade/common.sh2
-rwxr-xr-xpackage/base-files/files/lib/upgrade/stage21
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