aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq40xx/base-files
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2019-09-06 07:10:54 +0200
committerRafał Miłecki <rafal@milecki.pl>2019-09-16 05:57:08 +0200
commitc53a0ed5e38d254ed15a447bfb8fbcd2c4a3bda5 (patch)
treeb2c4f9b8a3e5d1232c9c7e297c343e76174bd86b /target/linux/ipq40xx/base-files
parentf69b855a7580f6d5ec411f16fdeb4d1b11884d2c (diff)
downloadupstream-c53a0ed5e38d254ed15a447bfb8fbcd2c4a3bda5.tar.gz
upstream-c53a0ed5e38d254ed15a447bfb8fbcd2c4a3bda5.tar.bz2
upstream-c53a0ed5e38d254ed15a447bfb8fbcd2c4a3bda5.zip
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> (cherry picked from commit a858db313687ddfa6ed1ddba76bd74844a7b89dc)
Diffstat (limited to 'target/linux/ipq40xx/base-files')
-rw-r--r--target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh2
-rw-r--r--target/linux/ipq40xx/base-files/lib/upgrade/platform.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh b/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh
index e313562017..8e02186eb8 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 ${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
diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
index ced5534162..2abafabbd0 100644
--- 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
- 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