[openwrt/openwrt] ipq806x: Fix Linksys upgrade, restore config step

LEDE Commits lede-commits at lists.infradead.org
Sun Apr 2 07:19:34 PDT 2023


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/2715aff5df836c1d3eb8cbf5afdb0c197902ee4b

commit 2715aff5df836c1d3eb8cbf5afdb0c197902ee4b
Author: Jacob Aharon <ah.jacob at gmail.com>
AuthorDate: Mon Mar 27 12:12:48 2023 +1100

    ipq806x: Fix Linksys upgrade, restore config step
    
    It appears that the refactor of the upgrade process for NAND devices
    resulted in the nand_do_upgrade_success step not being called for
    devices using the linksys.sh script. As a result, configuration
    was not preserved over sysupgrade steps.
    
    This restores the preservation of configs for ipq806x devices using the
    linksys.sh script. Other devices and targets have not been examined.
    
    This commit uses the same functionality and terminology used in commit
    8634c10 ("ipq40xx: Fix Linksys upgrade, restore config step")
    
    Fixes: e25e6d8 ("base-files: fix and clean up nand sysupgrade code")
    Tested-on: EA8500
    
    Signed-off-by: Jacob Aharon <ah.jacob at gmail.com>
---
 target/linux/ipq806x/base-files/lib/upgrade/linksys.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh b/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
index 5f883637da..b0ad1b43be 100644
--- a/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
@@ -94,7 +94,12 @@ platform_do_upgrade_linksys() {
 
 
 		# complete std upgrade
-		nand_upgrade_tar "$1"
+		if nand_upgrade_tar "$1" ; then
+			nand_do_upgrade_success
+		else
+			nand_do_upgrade_failure
+		fi
+
 	}
 	[ "$magic_long" = "27051956" ] && {
 		get_image "$1" | mtd write - $part_label




More information about the lede-commits mailing list