diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2019-09-06 07:10:54 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2019-09-16 05:57:08 +0200 |
| commit | c53a0ed5e38d254ed15a447bfb8fbcd2c4a3bda5 (patch) | |
| tree | b2c4f9b8a3e5d1232c9c7e297c343e76174bd86b /target/linux/ath79 | |
| parent | f69b855a7580f6d5ec411f16fdeb4d1b11884d2c (diff) | |
| download | upstream-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/ath79')
| -rw-r--r-- | target/linux/ath79/base-files/lib/upgrade/platform.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ath79/base-files/lib/upgrade/platform.sh b/target/linux/ath79/base-files/lib/upgrade/platform.sh index be9cf3a7b9..f3e19a5694 100644 --- 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) - [ -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 @@ -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) - [ -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 |