diff options
| author | Michael Trinidad <trinidude4@hotmail.com> | 2023-04-01 15:04:02 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-04-11 12:21:15 +0200 |
| commit | 65f8089b7ada050c876064957db949c931b76358 (patch) | |
| tree | e627ff587c3cae3447515f39862ef677c12caeaf | |
| parent | 9cbc83726e3dc2d7cdc603030d0a63e4bc3f18ff (diff) | |
| download | upstream-65f8089b7ada050c876064957db949c931b76358.tar.gz upstream-65f8089b7ada050c876064957db949c931b76358.tar.bz2 upstream-65f8089b7ada050c876064957db949c931b76358.zip | |
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@hotmail.com>
| -rw-r--r-- | target/linux/kirkwood/base-files/lib/upgrade/linksys.sh | 7 |
1 files changed, 6 insertions, 1 deletions
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 |