aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/base-files
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2019-09-04 16:57:40 +0200
committerRafał Miłecki <rafal@milecki.pl>2019-09-05 14:33:20 +0200
commit62dbe361a1b1ed1506bc0387bff55eddcb619e49 (patch)
treeac71c95b7d7ebc949c8a55487fd4b4dfc7f98520 /target/linux/mvebu/base-files
parentbf390478727ac5f4f9d6fb684de48b8150bcec67 (diff)
downloadupstream-62dbe361a1b1ed1506bc0387bff55eddcb619e49.tar.gz
upstream-62dbe361a1b1ed1506bc0387bff55eddcb619e49.tar.bz2
upstream-62dbe361a1b1ed1506bc0387bff55eddcb619e49.zip
treewide: when copying a backup file always specify dest name
$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>
Diffstat (limited to 'target/linux/mvebu/base-files')
-rw-r--r--target/linux/mvebu/base-files/lib/upgrade/linksys.sh2
-rw-r--r--target/linux/mvebu/base-files/lib/upgrade/sdcard.sh2
-rw-r--r--target/linux/mvebu/base-files/lib/upgrade/uDPU.sh2
3 files changed, 3 insertions, 3 deletions
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
}