[openwrt/openwrt] mvebu: cortexa9: fix Linksys upgrade, restore config step

LEDE Commits lede-commits at lists.infradead.org
Tue Apr 11 03:25:09 PDT 2023


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

commit d1c1e10e89f144a850fd09743e268b499e9f2b2a
Author: Michael Trinidad <trinidude4 at hotmail.com>
AuthorDate: Fri Apr 7 09:02:37 2023 -0400

    mvebu: cortexa9: 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 mvebu/cortexa9 devices using the
    linksys.sh script.
    
    Fixes: e25e6d8e5407 ("base-files: fix and clean up nand sysupgrade code")
    Signed-off-by: Michael Trinidad <trinidude4 at hotmail.com>
---
 target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh
index 1a23a9bbc2..d4222a3f31 100644
--- a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh
@@ -68,7 +68,12 @@ platform_do_upgrade_linksys() {
 			CI_UBIPART="rootfs2"
 		fi
 
-		nand_upgrade_tar "$1"
+		if nand_upgrade_tar "$1" ; then
+			nand_do_upgrade_success
+		else
+			nand_do_upgrade_failed
+		fi
+
 	}
 	[ "$magic_long" = "27051956" -o "$magic_long" = "0000a0e1" ] && {
 		get_image "$1" | mtd write - $part_label




More information about the lede-commits mailing list