[OpenWrt-Devel] ath79: really fix invalid UPGRADE_OPT_SAVE_CONFIG spellings
diff mbox series

Message ID 20190905220317.5060-1-freifunk@adrianschmutzler.de
State Not Applicable
Headers show
Series
  • [OpenWrt-Devel] ath79: really fix invalid UPGRADE_OPT_SAVE_CONFIG spellings
Related show

Commit Message

Adrian Schmutzler Sept. 5, 2019, 10:03 p.m. UTC
This fixes two cases were the prefix UPGRADE_OPT_ has been added
three times, so it remained wrong after removing one prefix in
1078de96e315 ("treewide: fix invalid UPGRADE_OPT_SAVE_CONFIG
spellings").

Fixes: 1078de9 ("treewide: fix invalid UPGRADE_OPT_SAVE_CONFIG spellings")
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

---

This fix and previous patches need to be backported to 19.07, since
the initial introduction of the UPGRADE_OPT_SAVE_CONFIG variable
has already been backported there.
---
 target/linux/ath79/base-files/lib/upgrade/platform.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch
diff mbox series

diff --git a/target/linux/ath79/base-files/lib/upgrade/platform.sh b/target/linux/ath79/base-files/lib/upgrade/platform.sh
index f7e62143e7..be2eb40b79 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" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && 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" -a "$UPGRADE_OPT_SAVE_CONFIG" -eq 1 ] && 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