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

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


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

commit 65f8089b7ada050c876064957db949c931b76358
Author: Michael Trinidad <trinidude4 at hotmail.com>
AuthorDate: Sat Apr 1 15:04:02 2023 -0400

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

diff --git a/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh b/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh
index 9067f00e1a..207a65d713 100644
--- a/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/kirkwood/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" ] && {
 		get_image "$1" | mtd write - $part_label




More information about the lede-commits mailing list