treewide: fix upgrade led handling
authorMathias Kresin <dev@kresin.me>
Wed, 15 Aug 2018 17:12:27 +0000 (19:12 +0200)
committerMathias Kresin <dev@kresin.me>
Thu, 16 Aug 2018 19:20:57 +0000 (21:20 +0200)
The upgrade led is only used if a running led is defined. If no running
led is defined, the upgrade led is ignored and upgrade isn't indicated
at all.

Instead, turn off the running led prior to turning the upgrade led on.
In most cases there isn't any visual change, but it allows to use an
independent led for upgrade indication.

Signed-off-by: Mathias Kresin <dev@kresin.me>
target/linux/apm821xx/base-files/etc/diag.sh
target/linux/ath79/base-files/etc/diag.sh
target/linux/ipq40xx/base-files/etc/diag.sh
target/linux/ipq806x/base-files/etc/diag.sh

index 26c035c..96d42a4 100755 (executable)
@@ -29,9 +29,11 @@ set_state() {
                ;;
        upgrade)
                [ -n "$running" ] && {
-                       status_led="$upgrade"
-                       status_led_blink_preinit_regular
+                       status_led="$running"
+                       status_led_off
                }
+               status_led="$upgrade"
+               status_led_blink_preinit_regular
                ;;
        done)
                status_led_off
index a3a7047..782bab9 100755 (executable)
@@ -32,9 +32,11 @@ set_state() {
                ;;
        upgrade)
                [ -n "$running" ] && {
-                       status_led="$upgrade"
-                       status_led_blink_preinit_regular
+                       status_led="$running"
+                       status_led_off
                }
+               status_led="$upgrade"
+               status_led_blink_preinit_regular
                ;;
        done)
                status_led_off
index a3a7047..782bab9 100755 (executable)
@@ -32,9 +32,11 @@ set_state() {
                ;;
        upgrade)
                [ -n "$running" ] && {
-                       status_led="$upgrade"
-                       status_led_blink_preinit_regular
+                       status_led="$running"
+                       status_led_off
                }
+               status_led="$upgrade"
+               status_led_blink_preinit_regular
                ;;
        done)
                status_led_off
index df4afd9..9e6b491 100755 (executable)
@@ -29,9 +29,11 @@ set_state() {
                ;;
        upgrade)
                [ -n "$running" ] && {
-                       status_led="$upgrade"
-                       status_led_blink_preinit_regular
+                       status_led="$running"
+                       status_led_off
                }
+               status_led="$upgrade"
+               status_led_blink_preinit_regular
                ;;
        done)
                status_led_off