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) --- target/linux/brcm2708/base-files/lib/preinit/79_move_config | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'target/linux/brcm2708') diff --git a/target/linux/brcm2708/base-files/lib/preinit/79_move_config b/target/linux/brcm2708/base-files/lib/preinit/79_move_config index b0ee62a809..b8738b645e 100644 --- a/target/linux/brcm2708/base-files/lib/preinit/79_move_config +++ b/target/linux/brcm2708/base-files/lib/preinit/79_move_config @@ -1,6 +1,8 @@ #!/bin/sh # Copyright (C) 2015 OpenWrt.org +. /lib/upgrade/common.sh + BOOTPART=/dev/mmcblk0p1 move_config() { @@ -11,7 +13,7 @@ move_config() { insmod vfat mkdir -p /boot mount -t vfat -o rw,noatime $BOOTPART /boot - [ -f /boot/sysupgrade.tgz ] && mv -f /boot/sysupgrade.tgz / + [ -f "/boot/$BACKUP_FILE" ] && mv -f "/boot/$BACKUP_FILE" / fi } -- cgit v1.2.3