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

LEDE Commits lede-commits at lists.infradead.org
Sun Mar 26 07:43:15 PDT 2023


chunkeey pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/8634c1080d5033e8cf0069ee7447821726232b95

commit 8634c1080d5033e8cf0069ee7447821726232b95
Author: Jeff Kletsky <git-commits at allycomm.com>
AuthorDate: Tue Jan 3 23:17:03 2023 -0800

    ipq40xx: 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 was restored for some devices in
    commit 84ff6c90dda1 ("base-files: bring back nand_do_upgrade_success").
    This restored preservation of config for ipq40xx devices using the
    linksys.sh script. Other devices and targets have not been examined.
    
    Closes: #11677
    Fixes: e25e6d8e54 ("base-files: fix and clean up nand sysupgrade code")
    Tested-on: EA8300
    
    Signed-off-by: Jeff Kletsky <git-commits at allycomm.com>
    (checkpatch nitpick)
    Signed-off-by: Christian Lamparter <chunkeey at gmail.com>
---
 target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh b/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh
index c0d45d640d..696f653eb9 100644
--- a/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh
@@ -100,7 +100,12 @@ platform_do_upgrade_linksys() {
 		fi
 
 		# 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" ] && {




More information about the lede-commits mailing list