From 37caec2d5e01b907a86969aa1526a6ec3812b511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 4 Sep 2019 16:57:39 +0200 Subject: treewide: don't hardcode "sysupgrade.tgz" file name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit bf390478727ac5f4f9d6fb684de48b8150bcec67) --- package/base-files/files/lib/upgrade/common.sh | 2 ++ package/base-files/files/lib/upgrade/nand.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'package/base-files/files') 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 -- cgit v1.2.3