From: Michael Trinidad Date: Fri, 7 Apr 2023 13:10:29 +0000 (-0400) Subject: base-files: fix Linksys upgrade, restore config step X-Git-Tag: v23.05.0-rc1~518 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F12307%2Fhead;p=thirdparty%2Fopenwrt.git 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 --- diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh b/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh index 696f653eb9e..18366fc622a 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 b0ad1b43be6..21d22c6f1bc 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 }