From a858db313687ddfa6ed1ddba76bd74844a7b89dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Fri, 6 Sep 2019 07:10:54 +0200 Subject: treewide: sysupgrade: use $UPGRADE_BACKUP to check for backup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- target/linux/ath25/base-files/lib/upgrade/platform.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/linux/ath25/base-files/lib/upgrade') diff --git a/target/linux/ath25/base-files/lib/upgrade/platform.sh b/target/linux/ath25/base-files/lib/upgrade/platform.sh index 0dde103605..778bbf5a39 100644 --- 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="" - [ -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 ) | \ -- cgit v1.2.3