treewide: use new procd sysupgrade $UPGRADE_BACKUP variable
authorRafał Miłecki <rafal@milecki.pl>
Thu, 5 Sep 2019 21:33:19 +0000 (23:33 +0200)
committerRafał Miłecki <rafal@milecki.pl>
Thu, 5 Sep 2019 21:33:19 +0000 (23:33 +0200)
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 <rafal@milecki.pl>
23 files changed:
package/base-files/files/lib/upgrade/common.sh
package/base-files/files/lib/upgrade/stage2
target/linux/apm821xx/base-files/lib/upgrade/wdbook.sh
target/linux/ar71xx/base-files/lib/upgrade/dir825.sh
target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
target/linux/ath25/base-files/lib/upgrade/platform.sh
target/linux/ath79/base-files/lib/upgrade/platform.sh
target/linux/brcm2708/base-files/lib/upgrade/platform.sh
target/linux/imx6/base-files/lib/upgrade/platform.sh
target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh
target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh
target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
target/linux/mediatek/base-files/lib/upgrade/platform.sh
target/linux/mvebu/base-files/lib/upgrade/linksys.sh
target/linux/mvebu/base-files/lib/upgrade/sdcard.sh
target/linux/mvebu/base-files/lib/upgrade/uDPU.sh
target/linux/octeon/base-files/lib/upgrade/platform.sh
target/linux/omap/base-files/lib/upgrade/platform.sh
target/linux/sunxi/base-files/lib/upgrade/platform.sh
target/linux/tegra/base-files/lib/upgrade/platform.sh
target/linux/x86/base-files/lib/upgrade/platform.sh

index 279470f..8e7866f 100644 (file)
@@ -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
index ff2a9ae..5d3d46e 100755 (executable)
@@ -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
index e3de6ed..1acc6c6 100644 (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/$BACKUP_FILE"
+               cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
                umount /mnt
        fi
 }
index eac0aef..c694c2e 100644 (file)
@@ -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 | \
index a6891db..8536d4b 100644 (file)
@@ -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)
index fd6453f..7261632 100755 (executable)
@@ -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 | \
index f0b937d..0dde103 100644 (file)
@@ -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 ) | \
index 7bad1af..f7e6214 100644 (file)
@@ -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
 
index 48994eb..811355b 100644 (file)
@@ -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
index 28bdec9..9414b18 100755 (executable)
@@ -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
 }
index 0d93f28..e313562 100644 (file)
@@ -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
index 8a97b6b..6b9858b 100644 (file)
@@ -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
index e9fb0ad..cece018 100644 (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/$BACKUP_FILE"
+               cp -v "$UPGRADE_BACKUP" "/tmp/new_root/$BACKUP_FILE"
                umount /tmp/new_root
        }
 
index 6072591..557f43c 100644 (file)
@@ -68,7 +68,7 @@ platform_do_upgrade_combined() {
           [ ${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"
 
                # write the kernel
                dd if="$1" bs=$CI_BLKSZ skip=1 count=$kern_blocks 2>/dev/null | \
index d1b9fde..9c99ee1 100755 (executable)
@@ -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
 }
index 5104db3..ca64a0e 100644 (file)
@@ -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
 }
index 03f6327..184803a 100644 (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/$BACKUP_FILE"
+               cp -af "$UPGRADE_BACKUP" "/boot/$BACKUP_FILE"
                sync
                umount /boot
        fi
index dbcff58..032c706 100644 (file)
@@ -149,8 +149,8 @@ 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/$BACKUP_FILE"
+       if [ -f "$UPGRADE_BACKUP" ]; then
+               cp -f "$UPGRADE_BACKUP" "/misc/$BACKUP_FILE"
                sync
        fi
 }
index 6233c33..4d0047b 100755 (executable)
@@ -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
index a5108c4..10412c5 100644 (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/$BACKUP_FILE"
+               cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
                umount /mnt
        fi
 }
index a5108c4..10412c5 100644 (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/$BACKUP_FILE"
+               cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
                umount /mnt
        fi
 }
index 9a8acde..ea9bbe9 100644 (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/$BACKUP_FILE"
+               cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
                umount /mnt
        fi
 }
index 855752b..3b6c258 100644 (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/$BACKUP_FILE"
+               cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
                umount /mnt
        fi
 }