aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2022-10-30 20:22:06 +0000
committerDaniel Golle <daniel@makrotopia.org>2022-10-30 20:26:12 +0000
commit84ff6c90dda1bef517675c50397d3080cdd3c6c2 (patch)
tree4eaac45934577db9442621c8c32f236eec8fa1e0 /package
parent910bdda6afa229e35ef6e1f74795ee79aa99c2e2 (diff)
downloadupstream-84ff6c90dda1bef517675c50397d3080cdd3c6c2.tar.gz
upstream-84ff6c90dda1bef517675c50397d3080cdd3c6c2.tar.bz2
upstream-84ff6c90dda1bef517675c50397d3080cdd3c6c2.zip
base-files: bring back nand_do_upgrade_success
Several Broadcom targets were using the nand_do_upgrade_success shell function which has been removed by commit e25e6d8e54 ("base-files: fix and clean up nand sysupgrade code"). Refactor the new nand_do_upgrade to bring back nand_do_upgrade_success with the behavior expected by those users. Fixes: e25e6d8e54 ("base-files: fix and clean up nand sysupgrade code") Reported-by: Chen Minqiang <ptpt52@gmail.com> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'package')
-rw-r--r--package/base-files/files/lib/upgrade/nand.sh10
1 files changed, 9 insertions, 1 deletions
diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh
index d9cfeede9c..1019b9927c 100644
--- a/package/base-files/files/lib/upgrade/nand.sh
+++ b/package/base-files/files/lib/upgrade/nand.sh
@@ -418,12 +418,20 @@ nand_do_upgrade() {
local file="$1"
sync
- if nand_do_flash_file "$file" && nand_do_restore_config && sync; then
+ nand_do_flash_file "$file" && nand_do_upgrade_success
+ nand_do_upgrade_failed
+}
+
+nand_do_upgrade_success() {
+ if nand_do_restore_config && sync; then
echo "sysupgrade successful"
umount -a
reboot -f
fi
+ nand_do_upgrade_failed
+}
+nand_do_upgrade_failed() {
sync
echo "sysupgrade failed"
# Should we reboot or bring up some failsafe mode instead?