diff options
| author | Jeff Kletsky <git-commits@allycomm.com> | 2023-01-03 23:17:03 -0800 |
|---|---|---|
| committer | Christian Lamparter <chunkeey@gmail.com> | 2023-03-26 16:39:37 +0200 |
| commit | 8634c1080d5033e8cf0069ee7447821726232b95 (patch) | |
| tree | 1968cc6095f6a28c57010afb32c798f4e736edf3 /target/linux/ipq40xx | |
| parent | 1558bbd116ec74b10672caa29c17a5f0279715f7 (diff) | |
| download | upstream-8634c1080d5033e8cf0069ee7447821726232b95.tar.gz upstream-8634c1080d5033e8cf0069ee7447821726232b95.tar.bz2 upstream-8634c1080d5033e8cf0069ee7447821726232b95.zip | |
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@allycomm.com>
(checkpatch nitpick)
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Diffstat (limited to 'target/linux/ipq40xx')
| -rw-r--r-- | target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh | 7 |
1 files changed, 6 insertions, 1 deletions
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" ] && { |