From 62dbe361a1b1ed1506bc0387bff55eddcb619e49 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
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 <rafal@milecki.pl>
---
 target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh   | 2 +-
 target/linux/brcm2708/base-files/lib/upgrade/platform.sh | 2 +-
 target/linux/imx6/base-files/lib/upgrade/platform.sh     | 2 +-
 target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh     | 2 +-
 target/linux/mediatek/base-files/lib/upgrade/platform.sh | 2 +-
 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 +-
 target/linux/octeon/base-files/lib/upgrade/platform.sh   | 2 +-
 target/linux/omap/base-files/lib/upgrade/platform.sh     | 2 +-
 target/linux/sunxi/base-files/lib/upgrade/platform.sh    | 2 +-
 target/linux/tegra/base-files/lib/upgrade/platform.sh    | 2 +-
 target/linux/x86/base-files/lib/upgrade/platform.sh      | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh b/target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh
index 01327d926a52..e3de6ed0b57c 100644
--- a/target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh
+++ b/target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh
@@ -88,7 +88,7 @@ mbl_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
 }
diff --git a/target/linux/brcm2708/base-files/lib/upgrade/platform.sh b/target/linux/brcm2708/base-files/lib/upgrade/platform.sh
index 693cde777950..48994ebe074c 100644
--- a/target/linux/brcm2708/base-files/lib/upgrade/platform.sh
+++ b/target/linux/brcm2708/base-files/lib/upgrade/platform.sh
@@ -91,7 +91,7 @@ platform_copy_config() {
 	if export_partdevice partdev 1; then
 		mkdir -p /boot
 		[ -f /boot/kernel.img ] || mount -t vfat -o rw,noatime "/dev/$partdev" /boot
-		cp -af "$CONF_TAR" /boot/
+		cp -af "$CONF_TAR" "/boot/$BACKUP_FILE"
 		tar -C / -zxvf "$CONF_TAR" boot/config.txt
 		sync
 		unmount /boot
diff --git a/target/linux/imx6/base-files/lib/upgrade/platform.sh b/target/linux/imx6/base-files/lib/upgrade/platform.sh
index 0ab2d984d3f7..28bdec9e9cd8 100755
--- a/target/linux/imx6/base-files/lib/upgrade/platform.sh
+++ b/target/linux/imx6/base-files/lib/upgrade/platform.sh
@@ -17,7 +17,7 @@ enable_image_metadata_check
 
 apalis_copy_config() {
 	apalis_mount_boot
-	cp -af "$CONF_TAR" /boot/
+	cp -af "$CONF_TAR" "/boot/$BACKUP_FILE"
 	sync
 	umount /boot
 }
diff --git a/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh b/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh
index 8888ec7d0465..e9fb0ad38862 100644
--- a/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh
@@ -60,7 +60,7 @@ zyxel_do_flash() {
 	mkdir /tmp/new_root
 	mount -t ext4 $loopdev /tmp/new_root && {
 		echo "Saving config to rootfs_data at position ${offset}."
-		cp -v "$CONF_TAR" /tmp/new_root/
+		cp -v "$CONF_TAR" "/tmp/new_root/$BACKUP_FILE"
 		umount /tmp/new_root
 	}
 
diff --git a/target/linux/mediatek/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/base-files/lib/upgrade/platform.sh
index d812a48720b8..d1b9fdeb9556 100755
--- a/target/linux/mediatek/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/base-files/lib/upgrade/platform.sh
@@ -54,7 +54,7 @@ platform_check_image() {
 platform_copy_config_emmc() {
 	mkdir -p /recovery
 	mount -o rw,noatime /dev/mmcblk0p1 /recovery
-	cp -af "$CONF_TAR" /recovery/
+	cp -af "$CONF_TAR" "/recovery/$BACKUP_FILE"
 	sync
 	umount /recovery
 }
diff --git a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
index 857c550c73de..5104db31f3ce 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 3bfdce97e8d9..03f632765728 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 f87ff4f9ca05..dbcff5836803 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
 }
diff --git a/target/linux/octeon/base-files/lib/upgrade/platform.sh b/target/linux/octeon/base-files/lib/upgrade/platform.sh
index 0e4ca3762982..6233c337bc09 100755
--- a/target/linux/octeon/base-files/lib/upgrade/platform.sh
+++ b/target/linux/octeon/base-files/lib/upgrade/platform.sh
@@ -25,7 +25,7 @@ platform_copy_config() {
 	case "$(board_name)" in
 	erlite)
 		mount -t vfat /dev/sda1 /mnt
-		cp -af "$CONF_TAR" /mnt/
+		cp -af "$CONF_TAR" "/mnt/$BACKUP_FILE"
 		umount /mnt
 		;;
 	esac
diff --git a/target/linux/omap/base-files/lib/upgrade/platform.sh b/target/linux/omap/base-files/lib/upgrade/platform.sh
index c8b0175fd58c..a5108c4c0226 100644
--- a/target/linux/omap/base-files/lib/upgrade/platform.sh
+++ b/target/linux/omap/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/sunxi/base-files/lib/upgrade/platform.sh b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
index c8b0175fd58c..a5108c4c0226 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/tegra/base-files/lib/upgrade/platform.sh b/target/linux/tegra/base-files/lib/upgrade/platform.sh
index 66e7d91e3cb1..9a8acde9b68d 100644
--- a/target/linux/tegra/base-files/lib/upgrade/platform.sh
+++ b/target/linux/tegra/base-files/lib/upgrade/platform.sh
@@ -47,7 +47,7 @@ platform_copy_config() {
 
 	if export_partdevice partdev 1; then
 		mount -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 162dbaf3aaaa..855752b5d704 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.30.2