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

treewide: use new procd sysupgrade $UPGRADE_BACKUP variable

Browse Source 
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>
(cherry picked from commit 641f6b6c26)
This commit is contained in:
Rafał Miłecki
2019-09-05 23:33:19 +02:00
parent 1b9a4f0cb4
commit a717428828
21 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/files/lib/upgrade/common.sh
View File

@@ -221,7 +221,7 @@ indicate_upgrade() {
default_do_upgrade() { default_do_upgrade() {
sync sync
if [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ]; then 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 else
get_image "$1" "$2" | mtd $MTD_ARGS write - "${PART_NAME:-image}" get_image "$1" "$2" | mtd $MTD_ARGS write - "${PART_NAME:-image}"
fi fi

1
package/base-files/files/lib/upgrade/stage2
View File

@@ -9,7 +9,6 @@ COMMAND="$2"
export INTERACTIVE=0 export INTERACTIVE=0
export VERBOSE=1 export VERBOSE=1
export CONFFILES=/tmp/sysupgrade.conffiles export CONFFILES=/tmp/sysupgrade.conffiles
export CONF_TAR=/tmp/sysupgrade.tgz
RAMFS_COPY_BIN= # extra programs for temporary ramfs root RAMFS_COPY_BIN= # extra programs for temporary ramfs root
RAMFS_COPY_DATA= # extra data files RAMFS_COPY_DATA= # extra data 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 if export_partdevice partdev 1; then
mount -t ext4 -o rw,noatime "/dev/$partdev" /mnt 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 umount /mnt
fi fi
} }

2
target/linux/ar71xx/base-files/lib/upgrade/dir825.sh
View File

@@ -75,7 +75,7 @@ dir825b_do_upgrade_combined() {
if [ -n "$fw_mtd" ] && [ ${fw_blocks:-0} -gt 0 ]; then if [ -n "$fw_mtd" ] && [ ${fw_blocks:-0} -gt 0 ]; then
local append="" 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 sync
dd if="$fw_file" bs=64k skip=1 count=$fw_blocks 2>/dev/null | \ dd if="$fw_file" bs=64k skip=1 count=$fw_blocks 2>/dev/null | \

2
target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
View File

@@ -159,7 +159,7 @@ platform_do_upgrade_openmesh()
local cfg_size= kernel_size= rootfs_size= local cfg_size= kernel_size= rootfs_size=
local append="" 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) 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) kernel_size=$(dd if="$img_path" bs=2 skip=71 count=4 2>/dev/null)

4
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
View File

@@ -65,7 +65,7 @@ platform_do_upgrade_combined() {
then then
local rootfspart=$(platform_find_rootfspart "$partitions" "$kernelpart") local rootfspart=$(platform_find_rootfspart "$partitions" "$kernelpart")
local append="" 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 if [ "$PLATFORM_DO_UPGRADE_COMBINED_SEPARATE_MTD" -ne 1 ]; then
( dd if="$1" bs=$CI_BLKSZ skip=1 count=$kern_blocks 2>/dev/null; \ ( 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 if [ -n "$fw_mtd" ] && [ ${fw_blocks:-0} -gt 0 ]; then
local append="" 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 sync
dd if="$fw_file" bs=64k skip=1 count=$fw_blocks 2>/dev/null | \ dd if="$fw_file" bs=64k skip=1 count=$fw_blocks 2>/dev/null | \

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

@@ -67,7 +67,7 @@ platform_do_upgrade() {
[ ${erase_size:-0} -gt 0 ]; [ ${erase_size:-0} -gt 0 ];
then then
local append="" 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 count=$kern_blocks 2>/dev/null; \
dd if="$1" bs=$CI_BLKSZ skip=$((1+$kern_blocks)) count=$root_blocks 2>/dev/null ) | \ dd if="$1" bs=$CI_BLKSZ skip=$((1+$kern_blocks)) count=$root_blocks 2>/dev/null ) | \

4
target/linux/ath79/base-files/lib/upgrade/platform.sh
View File

@@ -14,7 +14,7 @@ redboot_fis_do_upgrade() {
if [ "$magic" = "4349" ]; then if [ "$magic" = "4349" ]; then
local kern_length=0x$(dd if="$sysup_file" bs=2 skip=1 count=4 2>/dev/null) 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 | \ 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 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 board_dir=$(tar tf $sysup_file | grep -m 1 '^sysupgrade-.*/$')
local kern_length=$(tar xf $sysup_file ${board_dir}kernel -O | wc -c) 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 | \ 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 mtd -r $append -F$kern_part:$kern_length:0x80060000,rootfs write - $kern_part:rootfs

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

@@ -91,8 +91,8 @@ platform_copy_config() {
if export_partdevice partdev 1; then if export_partdevice partdev 1; then
mkdir -p /boot mkdir -p /boot
[ -f /boot/kernel.img ] || mount -t vfat -o rw,noatime "/dev/$partdev" /boot [ -f /boot/kernel.img ] || mount -t vfat -o rw,noatime "/dev/$partdev" /boot
cp -af "$CONF_TAR" "/boot/$BACKUP_FILE" cp -af "$UPGRADE_BACKUP" "/boot/$BACKUP_FILE"
tar -C / -zxvf "$CONF_TAR" boot/config.txt tar -C / -zxvf "$UPGRADE_BACKUP" boot/config.txt
sync sync
unmount /boot unmount /boot
fi fi

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

@@ -17,7 +17,7 @@ enable_image_metadata_check
apalis_copy_config() { apalis_copy_config() {
apalis_mount_boot apalis_mount_boot
cp -af "$CONF_TAR" "/boot/$BACKUP_FILE" cp -af "$UPGRADE_BACKUP" "/boot/$BACKUP_FILE"
sync sync
umount /boot umount /boot
} }

2
target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh
View File

@@ -74,7 +74,7 @@ platform_do_upgrade_openmesh() {
# #
# take care of restoring a saved config # 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 mtd -q erase inactive
tar xf $tar_file ${board_dir}/root -O | mtd -n -p $kernel_length $restore_backup write - $PART_NAME tar xf $tar_file ${board_dir}/root -O | mtd -n -p $kernel_length $restore_backup write - $PART_NAME

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

@@ -38,7 +38,7 @@ zyxel_do_upgrade() {
tar Oxf $tar_file ${board_dir}/kernel | mtd write - kernel tar Oxf $tar_file ${board_dir}/kernel | mtd write - kernel
if [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ]; then 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 else
tar Oxf $tar_file ${board_dir}/root | mtd write - rootfs tar Oxf $tar_file ${board_dir}/root | mtd write - rootfs
fi fi

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

@@ -60,7 +60,7 @@ zyxel_do_flash() {
mkdir /tmp/new_root mkdir /tmp/new_root
mount -t ext4 $loopdev /tmp/new_root && { mount -t ext4 $loopdev /tmp/new_root && {
echo "Saving config to rootfs_data at position ${offset}." 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 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() { platform_copy_config_emmc() {
mkdir -p /recovery mkdir -p /recovery
mount -o rw,noatime /dev/mmcblk0p1 /recovery mount -o rw,noatime /dev/mmcblk0p1 /recovery
cp -af "$CONF_TAR" "/recovery/$BACKUP_FILE" cp -af "$UPGRADE_BACKUP" "/recovery/$BACKUP_FILE"
sync sync
umount /recovery 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() { platform_copy_config_linksys() {
cp -f "$CONF_TAR" "/tmp/syscfg/$BACKUP_FILE" cp -f "$UPGRADE_BACKUP" "/tmp/syscfg/$BACKUP_FILE"
sync 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 if export_partdevice partdev 1; then
mkdir -p /boot mkdir -p /boot
[ -f /boot/kernel.img ] || mount -o rw,noatime /dev/$partdev /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 sync
umount /boot umount /boot
fi fi

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

@@ -25,7 +25,7 @@ platform_copy_config() {
case "$(board_name)" in case "$(board_name)" in
erlite) erlite)
mount -t vfat /dev/sda1 /mnt mount -t vfat /dev/sda1 /mnt
cp -af "$CONF_TAR" "/mnt/$BACKUP_FILE" cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
umount /mnt umount /mnt
;; ;;
esac 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 if export_partdevice partdev 1; then
mount -t vfat -o rw,noatime "/dev/$partdev" /mnt 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 umount /mnt
fi 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 if export_partdevice partdev 1; then
mount -t vfat -o rw,noatime "/dev/$partdev" /mnt 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 umount /mnt
fi 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 if export_partdevice partdev 1; then
mount -o rw,noatime "/dev/$partdev" /mnt mount -o rw,noatime "/dev/$partdev" /mnt
cp -af "$CONF_TAR" "/mnt/$BACKUP_FILE" cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
umount /mnt umount /mnt
fi 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 if export_partdevice partdev 1; then
mount -t ext4 -o rw,noatime "/dev/$partdev" /mnt 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 umount /mnt
fi fi
} }