From a717428828558577760abfcf83a54e3d7459ee0b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Thu, 5 Sep 2019 23:33:19 +0200 Subject: [PATCH] treewide: use new procd sysupgrade $UPGRADE_BACKUP variable MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It's a variable set by procd that should replace hardcoded /tmp/sysupgrade.tgz. This change requires the most recent procd with the commit 0f3c136 ("sysupgrade: set UPGRADE_BACKUP env variable"). Signed-off-by: Rafał Miłecki (cherry picked from commit 641f6b6c26cb9ab5e1198810015e5f4b2b5b34ad) --- package/base-files/files/lib/upgrade/common.sh | 2 +- package/base-files/files/lib/upgrade/stage2 | 1 - target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh | 2 +- target/linux/ar71xx/base-files/lib/upgrade/dir825.sh | 2 +- target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh | 2 +- target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 4 ++-- target/linux/ath25/base-files/lib/upgrade/platform.sh | 2 +- target/linux/ath79/base-files/lib/upgrade/platform.sh | 4 ++-- target/linux/brcm2708/base-files/lib/upgrade/platform.sh | 4 ++-- target/linux/imx6/base-files/lib/upgrade/platform.sh | 2 +- target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh | 2 +- target/linux/ipq40xx/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/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 +- 21 files changed, 23 insertions(+), 24 deletions(-) diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 279470fcd8..8e7866f698 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -221,7 +221,7 @@ indicate_upgrade() { default_do_upgrade() { sync if [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ]; then - get_image "$1" "$2" | mtd $MTD_ARGS $MTD_CONFIG_ARGS -j "$CONF_TAR" write - "${PART_NAME:-image}" + get_image "$1" "$2" | mtd $MTD_ARGS $MTD_CONFIG_ARGS -j "$UPGRADE_BACKUP" write - "${PART_NAME:-image}" else get_image "$1" "$2" | mtd $MTD_ARGS write - "${PART_NAME:-image}" fi diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2 index ff2a9aee05..5d3d46ee80 100755 --- a/package/base-files/files/lib/upgrade/stage2 +++ b/package/base-files/files/lib/upgrade/stage2 @@ -9,7 +9,6 @@ COMMAND="$2" export INTERACTIVE=0 export VERBOSE=1 export CONFFILES=/tmp/sysupgrade.conffiles -export CONF_TAR=/tmp/sysupgrade.tgz RAMFS_COPY_BIN= # extra programs for temporary ramfs root RAMFS_COPY_DATA= # extra data files diff --git a/target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh b/target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh index e3de6ed0b5..1acc6c67cf 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/$BACKUP_FILE" + cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE" umount /mnt fi } diff --git a/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh b/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh index eac0aef1b8..c694c2e6f2 100644 --- a/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh @@ -75,7 +75,7 @@ dir825b_do_upgrade_combined() { if [ -n "$fw_mtd" ] && [ ${fw_blocks:-0} -gt 0 ]; then local append="" - [ -f "$CONF_TAR" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR" + [ -f "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $UPGRADE_BACKUP" sync dd if="$fw_file" bs=64k skip=1 count=$fw_blocks 2>/dev/null | \ diff --git a/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh b/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh index a6891dbbe7..8536d4ba4a 100644 --- a/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh @@ -159,7 +159,7 @@ platform_do_upgrade_openmesh() local cfg_size= kernel_size= rootfs_size= local append="" - [ -f "$CONF_TAR" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR" + [ -f "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $UPGRADE_BACKUP" cfg_size=$(dd if="$img_path" bs=2 skip=35 count=4 2>/dev/null) kernel_size=$(dd if="$img_path" bs=2 skip=71 count=4 2>/dev/null) diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index af0c1b2473..8729f5a315 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -65,7 +65,7 @@ platform_do_upgrade_combined() { then local rootfspart=$(platform_find_rootfspart "$partitions" "$kernelpart") local append="" - [ -f "$CONF_TAR" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR" + [ -f "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $UPGRADE_BACKUP" if [ "$PLATFORM_DO_UPGRADE_COMBINED_SEPARATE_MTD" -ne 1 ]; then ( dd if="$1" bs=$CI_BLKSZ skip=1 count=$kern_blocks 2>/dev/null; \ @@ -164,7 +164,7 @@ platform_do_upgrade_compex() { if [ -n "$fw_mtd" ] && [ ${fw_blocks:-0} -gt 0 ]; then local append="" - [ -f "$CONF_TAR" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR" + [ -f "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $UPGRADE_BACKUPs" sync dd if="$fw_file" bs=64k skip=1 count=$fw_blocks 2>/dev/null | \ diff --git a/target/linux/ath25/base-files/lib/upgrade/platform.sh b/target/linux/ath25/base-files/lib/upgrade/platform.sh index f0b937df22..0dde103605 100644 --- a/target/linux/ath25/base-files/lib/upgrade/platform.sh +++ b/target/linux/ath25/base-files/lib/upgrade/platform.sh @@ -67,7 +67,7 @@ platform_do_upgrade() { [ ${erase_size:-0} -gt 0 ]; then local append="" - [ -f "$CONF_TAR" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR" + [ -f "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $UPGRADE_BACKUP" ( dd if="$1" bs=$CI_BLKSZ skip=1 count=$kern_blocks 2>/dev/null; \ dd if="$1" bs=$CI_BLKSZ skip=$((1+$kern_blocks)) count=$root_blocks 2>/dev/null ) | \ diff --git a/target/linux/ath79/base-files/lib/upgrade/platform.sh b/target/linux/ath79/base-files/lib/upgrade/platform.sh index 679f46d079..be9cf3a7b9 100644 --- a/target/linux/ath79/base-files/lib/upgrade/platform.sh +++ b/target/linux/ath79/base-files/lib/upgrade/platform.sh @@ -14,7 +14,7 @@ redboot_fis_do_upgrade() { if [ "$magic" = "4349" ]; then local kern_length=0x$(dd if="$sysup_file" bs=2 skip=1 count=4 2>/dev/null) - [ -f "$CONF_TAR" -a "$UPGRADE_OPT_UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR" + [ -f "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $UPGRADE_BACKUP" dd if="$sysup_file" bs=64k skip=1 2>/dev/null | \ mtd -r $append -F$kern_part:$kern_length:0x80060000,rootfs write - $kern_part:rootfs @@ -22,7 +22,7 @@ redboot_fis_do_upgrade() { local board_dir=$(tar tf $sysup_file | grep -m 1 '^sysupgrade-.*/$') local kern_length=$(tar xf $sysup_file ${board_dir}kernel -O | wc -c) - [ -f "$CONF_TAR" -a "$UPGRADE_OPT_UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR" + [ -f "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $UPGRADE_BACKUP" tar xf $sysup_file ${board_dir}kernel ${board_dir}root -O | \ mtd -r $append -F$kern_part:$kern_length:0x80060000,rootfs write - $kern_part:rootfs diff --git a/target/linux/brcm2708/base-files/lib/upgrade/platform.sh b/target/linux/brcm2708/base-files/lib/upgrade/platform.sh index 48994ebe07..811355b8f7 100644 --- a/target/linux/brcm2708/base-files/lib/upgrade/platform.sh +++ b/target/linux/brcm2708/base-files/lib/upgrade/platform.sh @@ -91,8 +91,8 @@ 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/$BACKUP_FILE" - tar -C / -zxvf "$CONF_TAR" boot/config.txt + cp -af "$UPGRADE_BACKUP" "/boot/$BACKUP_FILE" + tar -C / -zxvf "$UPGRADE_BACKUP" boot/config.txt sync unmount /boot fi diff --git a/target/linux/imx6/base-files/lib/upgrade/platform.sh b/target/linux/imx6/base-files/lib/upgrade/platform.sh index c287efa0b3..906ef2e586 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/$BACKUP_FILE" + cp -af "$UPGRADE_BACKUP" "/boot/$BACKUP_FILE" sync umount /boot } diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh b/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh index 0d93f289a3..e313562017 100644 --- a/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh +++ b/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh @@ -74,7 +74,7 @@ platform_do_upgrade_openmesh() { # # take care of restoring a saved config - [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && restore_backup="${MTD_CONFIG_ARGS} -j ${CONF_TAR}" + [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && restore_backup="${MTD_CONFIG_ARGS} -j ${UPGRADE_BACKUP}" mtd -q erase inactive tar xf $tar_file ${board_dir}/root -O | mtd -n -p $kernel_length $restore_backup write - $PART_NAME diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh index 7a34e6c1d0..ced5534162 100644 --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh @@ -38,7 +38,7 @@ zyxel_do_upgrade() { tar Oxf $tar_file ${board_dir}/kernel | mtd write - kernel if [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ]; then - tar Oxf $tar_file ${board_dir}/root | mtd -j "$CONF_TAR" write - rootfs + tar Oxf $tar_file ${board_dir}/root | mtd -j "$UPGRADE_BACKUP" write - rootfs else tar Oxf $tar_file ${board_dir}/root | mtd write - rootfs fi diff --git a/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh b/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh index a86389c549..6a6d040bf3 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/$BACKUP_FILE" + cp -v "$UPGRADE_BACKUP" "/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 d1b9fdeb95..9c99ee1c18 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/$BACKUP_FILE" + cp -af "$UPGRADE_BACKUP" "/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 5104db31f3..ca64a0edf1 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/$BACKUP_FILE" + cp -f "$UPGRADE_BACKUP" "/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 03f6327657..184803a50f 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/$BACKUP_FILE" + cp -af "$UPGRADE_BACKUP" "/boot/$BACKUP_FILE" sync umount /boot fi diff --git a/target/linux/octeon/base-files/lib/upgrade/platform.sh b/target/linux/octeon/base-files/lib/upgrade/platform.sh index 6233c337bc..4d0047bceb 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/$BACKUP_FILE" + cp -af "$UPGRADE_BACKUP" "/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 a5108c4c02..10412c5176 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/$BACKUP_FILE" + cp -af "$UPGRADE_BACKUP" "/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 a5108c4c02..10412c5176 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/$BACKUP_FILE" + cp -af "$UPGRADE_BACKUP" "/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 9a8acde9b6..ea9bbe92bf 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/$BACKUP_FILE" + cp -af "$UPGRADE_BACKUP" "/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 855752b5d7..3b6c25877f 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/$BACKUP_FILE" + cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE" umount /mnt fi } -- 2.25.1