KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

treewide: consolidate upgrade state set

Browse source 
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 <dev@kresin.me>
This commit is contained in:
Mathias Kresin 2018-08-15 18:55:01 +02:00
parent 1ea1f3a223
commit 56b8ac1e86
6 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
package/base-files/files/lib/upgrade/common.sh
View file

@ -211,6 +211,11 @@ jffs2_copy_config() {
fi fi
} }
indicate_upgrade() {
. /etc/diag.sh
set_state upgrade
}
# Flash firmware to MTD partition # Flash firmware to MTD partition
# #
# $(1): path to image # $(1): path to image

1
package/base-files/files/lib/upgrade/stage2
View file

@ -122,6 +122,7 @@ kill_remaining() { # [ <signal> [ <loop> ] ]
echo echo
} }
indicate_upgrade
killall -9 telnetd killall -9 telnetd
killall -9 dropbear killall -9 dropbear

6
target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
View file

@ -83,9 +83,3 @@ platform_nand_pre_upgrade() {
;; ;;
esac esac
} }
blink_led() {
. /etc/diag.sh; set_state upgrade
}
append sysupgrade_pre_upgrade blink_led

6
target/linux/ipq806x/base-files/lib/upgrade/platform.sh
View file

@ -46,9 +46,3 @@ platform_nand_pre_upgrade() {
;; ;;
esac esac
} }
blink_led() {
. /etc/diag.sh; set_state upgrade
}
append sysupgrade_pre_upgrade blink_led

5
target/linux/pistachio/base-files/lib/upgrade/platform.sh
View file

@ -49,8 +49,3 @@ platform_nand_pre_upgrade() {
;; ;;
esac esac
} }
blink_led() {
. /etc/diag.sh; set_state upgrade
}
append sysupgrade_pre_upgrade blink_led

6
target/linux/ramips/base-files/lib/upgrade/platform.sh
View file

@ -367,9 +367,3 @@ platform_do_upgrade() {
;; ;;
esac esac
} }
blink_led() {
. /etc/diag.sh; set_state upgrade
}
append sysupgrade_pre_upgrade blink_led