mirror of https://github.com/hak5/openwrt.git
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>master
parent
bf39047872
commit
62dbe361a1
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue