treewide: sysupgrade: use $UPGRADE_BACKUP to check for backup

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>

diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index 8e7866f69847953c48dce009e473a82366e75f99..0d3162d4fcf6f9ac04705b5b076443440609e9dc 100644 (file)
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -220,7 +220,7 @@ indicate_upgrade() {
 # $(2): (optional) pipe command to extract firmware, e.g. dd bs=n skip=m
 default_do_upgrade() {
        sync
 # $(2): (optional) pipe command to extract firmware, e.g. dd bs=n skip=m
 default_do_upgrade() {
        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}"
        else
                get_image "$1" "$2" | mtd $MTD_ARGS 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}"

diff --git a/package/base-files/files/lib/upgrade/do_stage2 b/package/base-files/files/lib/upgrade/do_stage2
index 0e6cc1bfc360993a64fe50653433e0d9e3489810..0e3244574353c8a5c25415ccb3a7a0b3530caca6 100755 (executable)
--- a/package/base-files/files/lib/upgrade/do_stage2
+++ b/package/base-files/files/lib/upgrade/do_stage2
@@ -11,7 +11,7 @@ else
        default_do_upgrade "$IMAGE"
 fi
 
        default_do_upgrade "$IMAGE"
 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
 fi
 
        platform_copy_config
 fi
 

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index f18143bff42ef6659fb3a0281b19c60a72f125d8..935d08048e81c8c231301ac20647d340f102f930 100755 (executable)
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -371,7 +371,6 @@ else
                $backup_attr
                \"command\": $(json_string "$COMMAND"),
                \"options\": {
                $backup_attr
                \"command\": $(json_string "$COMMAND"),
                \"options\": {

-                       \"save_config\": $SAVE_CONFIG,

                        \"save_partitions\": $SAVE_PARTITIONS
                }
        }"
                        \"save_partitions\": $SAVE_PARTITIONS
                }
        }"

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh b/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh
index c694c2e6f283a7f75df2e072f192548f844f669e..e991a06b7a4dcb15be4b094da6af57b44332ca8e 100644 (file)
--- 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=""
 
        if [ -n "$fw_mtd" ] &&  [ ${fw_blocks:-0} -gt 0 ]; then
                local append=""

-               [ -f "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $UPGRADE_BACKUP"
+               [ -f "$UPGRADE_BACKUP" ] && append="-j $UPGRADE_BACKUP"

 
                sync
                dd if="$fw_file" bs=64k skip=1 count=$fw_blocks 2>/dev/null | \
 
                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 8536d4ba4af0b62a1f1de40cd85fbf3cd9f93c27..f43bdcea7fc18e3798cbf720e70df6dd2c9248c2 100644 (file)
--- 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=""
 
        local cfg_size= kernel_size= rootfs_size=
        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)
        kernel_size=$(dd if="$img_path" bs=2 skip=71 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)

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 726163291dd9b2889d140d8811c15102c54dcc0e..86e7b6386b6fd05863e0cc243ca481df8bebd643 100755 (executable)
--- 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=""
        then
                local rootfspart=$(platform_find_rootfspart "$partitions" "$kernelpart")
                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
                    ( dd if="$1" bs=$CI_BLKSZ skip=1 count=$kern_blocks 2>/dev/null; \
 
                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=""
 
        if [ -n "$fw_mtd" ] &&  [ ${fw_blocks:-0} -gt 0 ]; then
                local append=""

-               [ -f "$UPGRADE_BACKUP" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && append="-j $UPGRADE_BACKUPs"
+               [ -f "$UPGRADE_BACKUP" ] && append="-j $UPGRADE_BACKUPs"

 
                sync
                dd if="$fw_file" bs=64k skip=1 count=$fw_blocks 2>/dev/null | \
 
                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 0dde103605cd3fa7c9dc572c1e33ddaeda138a98..778bbf5a39c1051c4e00630774d7e34f0a933626 100644 (file)
--- 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=""
           [ ${erase_size:-0} -gt 0 ];
        then
                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+$kern_blocks)) count=$root_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 ) | \

diff --git a/target/linux/ath79/base-files/lib/upgrade/platform.sh b/target/linux/ath79/base-files/lib/upgrade/platform.sh
index f7e62143e77137534a9d1633fe4e4c6056c9f9b5..f4fca06384b1f02d2cc45a4992e019f5a7808db7 100644 (file)
--- 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)
 
        if [ "$magic" = "4349" ]; then
                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 | \
                        mtd -r $append -F$kern_part:$kern_length:0x80060000,rootfs write - $kern_part:rootfs
 
                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)
 
                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 "$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 | \
                        mtd -r $append -F$kern_part:$kern_length:0x80060000,rootfs write - $kern_part:rootfs
 
                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/imx6/base-files/lib/upgrade/platform.sh b/target/linux/imx6/base-files/lib/upgrade/platform.sh
index 9414b187106e9b04415570c6b400ee1828580436..a090cc080b16edc5eec039c7d99f106907154164 100755 (executable)
--- a/target/linux/imx6/base-files/lib/upgrade/platform.sh
+++ b/target/linux/imx6/base-files/lib/upgrade/platform.sh
@@ -75,7 +75,7 @@ platform_pre_upgrade() {
 
        case "$board" in
        apalis*)
 
        case "$board" in
        apalis*)

-               [ "$UPGRADE_OPT_SAVE_CONFIG" -eq 0 ] && {
+               [ -z "$UPGRADE_BACKUP" ] && {

                        jffs2reset -y
                        umount /overlay
                }
                        jffs2reset -y
                        umount /overlay
                }

diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh b/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh
index e3135620171552644b7161530d0ebeee1c3872e0..8e02186eb81b17d56d0cb8ceba95dbe506e2984b 100644 (file)
--- 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
        #
 
        # 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
        tar xf $tar_file ${board_dir}/root -O | mtd -n -p $kernel_length $restore_backup write - $PART_NAME
 
        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 6b9858beb0f43a6d13c2743f8340523cea43d4df..c12508c437a6dc966c88bee60857ede1e873b087 100644 (file)
--- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -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
        else
                tar Oxf $tar_file ${board_dir}/root | mtd 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

diff --git a/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh b/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
index 557f43ce6fb30530f6245e7a9e9da81c04646b3b..f83aa430cf94c7fa728fd52b536f0d9673c7032f 100644 (file)
--- a/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
@@ -68,7 +68,7 @@ platform_do_upgrade_combined() {
           [ ${erase_size:-0} -gt 0 ];
        then
                local append=""
           [ ${erase_size:-0} -gt 0 ];
        then
                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
                dd if="$1" bs=$CI_BLKSZ skip=1 count=$kern_blocks 2>/dev/null | \
 
                # write the kernel
                dd if="$1" bs=$CI_BLKSZ skip=1 count=$kern_blocks 2>/dev/null | \