[openwrt/openwrt] base-files: fix Linksys upgrade, restore config step

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


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

commit ff91a12c8db4e09105d06448a8114bd52ae17425
Author: Michael Trinidad <trinidude4 at hotmail.com>
AuthorDate: Fri Apr 7 09:10:29 2023 -0400

    base-files: 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 corrects a typo in the call of nand_do_upgrade_failed for ipq40xx
    and ipq806x devices using the linksys.sh script.
    
    Fixes: 8634c1080d50 ("ipq40xx: Fix Linksys upgrade, restore config step")
    Fixes: 2715aff5df83 ("ipq806x: Fix Linksys upgrade, restore config step")
    Signed-off-by: Michael Trinidad <trinidude4 at hotmail.com>
---
 target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh | 2 +-
 target/linux/ipq806x/base-files/lib/upgrade/linksys.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh b/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh
index 696f653eb9..18366fc622 100644
--- a/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh
@@ -103,7 +103,7 @@ platform_do_upgrade_linksys() {
 		if nand_upgrade_tar "$1" ; then
 			nand_do_upgrade_success
 		else
-			nand_do_upgrade_failure
+			nand_do_upgrade_failed
 		fi
 
 	}
diff --git a/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh b/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
index b0ad1b43be..21d22c6f1b 100644
--- a/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
@@ -97,7 +97,7 @@ platform_do_upgrade_linksys() {
 		if nand_upgrade_tar "$1" ; then
 			nand_do_upgrade_success
 		else
-			nand_do_upgrade_failure
+			nand_do_upgrade_failed
 		fi
 
 	}




More information about the lede-commits mailing list