From 56b8ac1e86eb5b0c500cbf8db60ce00aff01bcec Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Wed, 15 Aug 2018 18:55:01 +0200 Subject: treewide: consolidate upgrade state set Set the (sys)upgrade state when sourcing the stage2 script instead of setting the state for each target individual. This change fixes the, due to a missing state set, not working upgrade led on ath79 and apm821xx. Signed-off-by: Mathias Kresin --- package/base-files/files/lib/upgrade/common.sh | 5 +++++ package/base-files/files/lib/upgrade/stage2 | 1 + 2 files changed, 6 insertions(+) (limited to 'package/base-files/files/lib') diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 0cbd2ab3a6..9e9144cba4 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -211,6 +211,11 @@ jffs2_copy_config() { fi } +indicate_upgrade() { + . /etc/diag.sh + set_state upgrade +} + # Flash firmware to MTD partition # # $(1): path to image diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2 index 3985d8fd7e..bdc12c7426 100755 --- a/package/base-files/files/lib/upgrade/stage2 +++ b/package/base-files/files/lib/upgrade/stage2 @@ -122,6 +122,7 @@ kill_remaining() { # [ [ ] ] echo } +indicate_upgrade killall -9 telnetd killall -9 dropbear -- cgit v1.2.3