hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-11-03 14:34:27 -05:00
Code Issues Projects Releases Wiki Activity

treewide: sysupgrade: use $UPGRADE_BACKUP to check for backup

Browse Source 
Now that $UPGRADE_BACKUP is set conditionally there is no need to check
the $UPGRADE_OPT_SAVE_CONFIG anymore. All conditions can be simplified.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki 2019-09-06 07:10:54 +02:00
parent 9785a9121d
commit a858db3136
12 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,7 +220,7 @@ indicate_upgrade() {
# $(2): (optional) pipe command to extract firmware, e.g. dd bs=n skip=m # $(2): (optional) pipe command to extract firmware, e.g. dd bs=n skip=m
default_do_upgrade() { default_do_upgrade() {
sync sync
if [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ]; then if [ -n "$UPGRADE_BACKUP" ]; then
get_image "$1" "$2" | mtd $MTD_ARGS $MTD_CONFIG_ARGS -j "$UPGRADE_BACKUP" 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}"

2
package/base-files/files/lib/upgrade/do_stage2
View File

@ -11,7 +11,7 @@ else
default_do_upgrade "$IMAGE" default_do_upgrade "$IMAGE"
fi fi
if [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && type 'platform_copy_config' >/dev/null 2>/dev/null; then if [ -n "$UPGRADE_BACKUP" ] && type 'platform_copy_config' >/dev/null 2>/dev/null; then
platform_copy_config platform_copy_config
fi fi

1
package/base-files/files/sbin/sysupgrade
View File

@ -371,7 +371,6 @@ else
$backup_attr $backup_attr
\"command\": $(json_string "$COMMAND"), \"command\": $(json_string "$COMMAND"),
\"options\": { \"options\": {
\"save_config\": $SAVE_CONFIG,
\"save_partitions\": $SAVE_PARTITIONS \"save_partitions\": $SAVE_PARTITIONS
} }
}" }"

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 "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $UPGRADE_BACKUP" [ -f "$UPGRADE_BACKUP" ] && 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 "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $UPGRADE_BACKUP" [ -f "$UPGRADE_BACKUP" ] && 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 "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $UPGRADE_BACKUP" [ -f "$UPGRADE_BACKUP" ] && 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 "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $UPGRADE_BACKUPs" [ -f "$UPGRADE_BACKUP" ] && 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 "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $UPGRADE_BACKUP" [ -f "$UPGRADE_BACKUP" ] && 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 "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $UPGRADE_BACKUP" [ -f "$UPGRADE_BACKUP" ] && 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 "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $UPGRADE_BACKUP" [ -f "$UPGRADE_BACKUP" ] && 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

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

@ -75,7 +75,7 @@ platform_pre_upgrade() {
case "$board" in case "$board" in
apalis*) apalis*)
[ "$UPGRADE_OPT_SAVE_CONFIG" -eq 0 ] && { [ -z "$UPGRADE_BACKUP" ] && {
jffs2reset -y jffs2reset -y
umount /overlay umount /overlay
} }

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 ${UPGRADE_BACKUP}" [ -n "$UPGRADE_BACKUP" ] && 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

@ -37,7 +37,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 [ -n "$UPGRADE_BACKUP" ]; then
tar Oxf $tar_file ${board_dir}/root | mtd -j "$UPGRADE_BACKUP" 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

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

@ -68,7 +68,7 @@ platform_do_upgrade_combined() {
[ ${erase_size:-0} -gt 0 ]; [ ${erase_size:-0} -gt 0 ];
then then
local append="" local append=""
[ -f "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $UPGRADE_BACKUP" [ -f "$UPGRADE_BACKUP" ] && append="-j $UPGRADE_BACKUP"
# write the kernel # write the kernel
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 | \