From 37caec2d5e01b907a86969aa1526a6ec3812b511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
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 <rafal@milecki.pl>
(cherry picked from commit bf390478727ac5f4f9d6fb684de48b8150bcec67)
---
target/linux/imx6/base-files/lib/preinit/79_move_config | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'target/linux/imx6')
diff --git a/target/linux/imx6/base-files/lib/preinit/79_move_config b/target/linux/imx6/base-files/lib/preinit/79_move_config
index 6b66fbd42d..bdf397c4fc 100644
--- a/target/linux/imx6/base-files/lib/preinit/79_move_config
+++ b/target/linux/imx6/base-files/lib/preinit/79_move_config
@@ -2,6 +2,7 @@
. /lib/imx6.sh
. /lib/functions.sh
+. /lib/upgrade/common.sh
move_config() {
local board=$(board_name)
@@ -10,7 +11,7 @@ move_config() {
apalis*)
if [ -b $(bootpart_from_uuid) ]; then
apalis_mount_boot
- [ -f /boot/sysupgrade.tgz ] && mv -f /boot/sysupgrade.tgz /
+ [ -f "/boot/$BACKUP_FILE" ] && mv -f "/boot/$BACKUP_FILE" /
umount /boot
fi
;;
--
cgit v1.2.3