aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files/lib/upgrade
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-05 14:33:19 +0200
commitbf390478727ac5f4f9d6fb684de48b8150bcec67 (patch)
treecd19a4cb1b41476edf17cca11807c92541c8eb19 /package/base-files/files/lib/upgrade
parent1078de96e315f3cc2675b2c5935009e8c6159ad4 (diff)
downloadupstream-bf390478727ac5f4f9d6fb684de48b8150bcec67.tar.gz
upstream-bf390478727ac5f4f9d6fb684de48b8150bcec67.tar.bz2
upstream-bf390478727ac5f4f9d6fb684de48b8150bcec67.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>
Diffstat (limited to 'package/base-files/files/lib/upgrade')
-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 fbc2b5c19a..e7d7bf8d13 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