aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2019-09-04 16:57:39 +0200
committerRafał Miłecki <rafal@milecki.pl>2019-09-12 13:25:27 +0200
commit37caec2d5e01b907a86969aa1526a6ec3812b511 (patch)
treed93932477cb100306812e6fcad374e0c3f16e440 /package
parentf54bc3985a2fbc30256d9aee8ea3b60b8aee593a (diff)
downloadupstream-37caec2d5e01b907a86969aa1526a6ec3812b511.tar.gz
upstream-37caec2d5e01b907a86969aa1526a6ec3812b511.tar.bz2
upstream-37caec2d5e01b907a86969aa1526a6ec3812b511.zip
treewide: don't hardcode "sysupgrade.tgz" file name
1) Add BACKUP_FILE and use it when copying an archive to be restored after sysupgrade (on the next preinit). 2) Use CONF_TAR for copying backup prepared by the /sbin/sysupgrade Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit bf390478727ac5f4f9d6fb684de48b8150bcec67)
Diffstat (limited to 'package')
-rw-r--r--package/base-files/files/lib/upgrade/common.sh2
-rw-r--r--package/base-files/files/lib/upgrade/nand.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index efa301cd95..279470fcd8 100644
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -2,6 +2,8 @@
RAM_ROOT=/tmp/root
+export BACKUP_FILE=sysupgrade.tgz # file extracted by preinit
+
[ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
libs() { ldd $* 2>/dev/null | sed -r 's/(.* => )?(.*) .*/\2/'; }
diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh
index 9f258a82c5..fead846ecc 100644
--- a/package/base-files/files/lib/upgrade/nand.sh
+++ b/package/base-files/files/lib/upgrade/nand.sh
@@ -109,7 +109,7 @@ nand_restore_config() {
rmdir /tmp/new_root
return 1
fi
- mv "$1" "/tmp/new_root/sysupgrade.tgz"
+ mv "$1" "/tmp/new_root/$BACKUP_FILE"
umount /tmp/new_root
sync
rmdir /tmp/new_root