From 050a9b5145ed7cd5254f35205038734df30dc7f2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 4 Sep 2019 16:57:40 +0200 Subject: [PATCH] treewide: when copying a backup file always specify dest name MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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 (cherry picked from commit 62dbe361a1b1ed1506bc0387bff55eddcb619e49) --- target/linux/sunxi/base-files/lib/upgrade/platform.sh | 2 +- target/linux/x86/base-files/lib/upgrade/platform.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/sunxi/base-files/lib/upgrade/platform.sh b/target/linux/sunxi/base-files/lib/upgrade/platform.sh index c8b0175fd5..a5108c4c02 100644 --- a/target/linux/sunxi/base-files/lib/upgrade/platform.sh +++ b/target/linux/sunxi/base-files/lib/upgrade/platform.sh @@ -30,7 +30,7 @@ platform_copy_config() { if export_partdevice partdev 1; then mount -t vfat -o rw,noatime "/dev/$partdev" /mnt - cp -af "$CONF_TAR" /mnt/ + cp -af "$CONF_TAR" "/mnt/$BACKUP_FILE" umount /mnt fi } diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh index 162dbaf3aa..855752b5d7 100644 --- a/target/linux/x86/base-files/lib/upgrade/platform.sh +++ b/target/linux/x86/base-files/lib/upgrade/platform.sh @@ -39,7 +39,7 @@ platform_copy_config() { if export_partdevice partdev 1; then mount -t ext4 -o rw,noatime "/dev/$partdev" /mnt - cp -af "$CONF_TAR" /mnt/ + cp -af "$CONF_TAR" "/mnt/$BACKUP_FILE" umount /mnt fi } -- 2.25.1