From 62dbe361a1b1ed1506bc0387bff55eddcb619e49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 4 Sep 2019 16:57:40 +0200 Subject: treewide: when copying a backup file always specify dest name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit $CONF_TAR shouldn't be assumed to always point to the sysupgrade.tgz. This change makes code more generic and allows refactoring $CONF_TAR. Signed-off-by: Rafał Miłecki --- target/linux/mvebu/base-files/lib/upgrade/linksys.sh | 2 +- target/linux/mvebu/base-files/lib/upgrade/sdcard.sh | 2 +- target/linux/mvebu/base-files/lib/upgrade/uDPU.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/mvebu') diff --git a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh index 857c550c73..5104db31f3 100644 --- a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh @@ -93,6 +93,6 @@ platform_do_upgrade_linksys() { } platform_copy_config_linksys() { - cp -f "$CONF_TAR" /tmp/syscfg/ + cp -f "$CONF_TAR" "/tmp/syscfg/$BACKUP_FILE" sync } diff --git a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh index 3bfdce97e8..03f6327657 100644 --- a/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/sdcard.sh @@ -106,7 +106,7 @@ platform_copy_config_sdcard() { if export_partdevice partdev 1; then mkdir -p /boot [ -f /boot/kernel.img ] || mount -o rw,noatime /dev/$partdev /boot - cp -af "$CONF_TAR" /boot/ + cp -af "$CONF_TAR" "/boot/$BACKUP_FILE" sync umount /boot fi diff --git a/target/linux/mvebu/base-files/lib/upgrade/uDPU.sh b/target/linux/mvebu/base-files/lib/upgrade/uDPU.sh index f87ff4f9ca..dbcff58368 100644 --- a/target/linux/mvebu/base-files/lib/upgrade/uDPU.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/uDPU.sh @@ -150,7 +150,7 @@ platform_do_upgrade_uDPU() { platform_copy_config_uDPU() { # Config is saved on the /misc partition and copied on the rootfs after the reboot if [ -f "$CONF_TAR" ]; then - cp -f "$CONF_TAR" /misc + cp -f "$CONF_TAR" "/misc/$BACKUP_FILE" sync fi } -- cgit v1.2.3