domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: when copying a backup file always specify dest name

Browse Source 
$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>
This commit is contained in:
Rafał Miłecki
2019-09-04 16:57:40 +02:00
parent bf39047872
commit 62dbe361a1
13 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh
View File

@@ -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
}

2
target/linux/brcm2708/base-files/lib/upgrade/platform.sh
View File

@@ -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

2
target/linux/imx6/base-files/lib/upgrade/platform.sh
View File

@@ -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
}

2
target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh
View File

@@ -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
}

2
target/linux/mediatek/base-files/lib/upgrade/platform.sh
View File

@@ -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
}

2
target/linux/mvebu/base-files/lib/upgrade/linksys.sh
View File

@@ -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
}

2
target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
View File

@@ -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

2
target/linux/mvebu/base-files/lib/upgrade/uDPU.sh
View File

@@ -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
}

2
target/linux/octeon/base-files/lib/upgrade/platform.sh
View File

@@ -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

2
target/linux/omap/base-files/lib/upgrade/platform.sh
View File

@@ -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
}

2
target/linux/sunxi/base-files/lib/upgrade/platform.sh
View File

@@ -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
}

2
target/linux/tegra/base-files/lib/upgrade/platform.sh
View File

@@ -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
}

2
target/linux/x86/base-files/lib/upgrade/platform.sh
View File

@@ -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
}