diff --git a/package/base-files/files/lib/functions/leds.sh b/package/base-files/files/lib/functions/leds.sh index 743c7da782c..4ac81455fac 100644 --- a/package/base-files/files/lib/functions/leds.sh +++ b/package/base-files/files/lib/functions/leds.sh @@ -66,3 +66,7 @@ status_led_blink_preinit() { status_led_blink_failsafe() { led_timer $status_led 50 50 } + +status_led_blink_preinit_regular() { + led_timer $status_led 500 500 +} diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit index 900911606a6..8e94df9ab2d 100644 --- a/package/base-files/files/lib/preinit/10_indicate_preinit +++ b/package/base-files/files/lib/preinit/10_indicate_preinit @@ -36,13 +36,9 @@ preinit_echo() { echo $1 } -pi_indicate_led() { - set_state preinit -} - pi_indicate_preinit() { preinit_net_echo "Doing OpenWrt Preinit\n" - pi_indicate_led + set_state preinit } boot_hook_add preinit_main preinit_ip diff --git a/package/base-files/files/lib/preinit/50_indicate_regular_preinit b/package/base-files/files/lib/preinit/50_indicate_regular_preinit index bc223b358ea..5b7523f6fd3 100644 --- a/package/base-files/files/lib/preinit/50_indicate_regular_preinit +++ b/package/base-files/files/lib/preinit/50_indicate_regular_preinit @@ -4,7 +4,7 @@ indicate_regular_preinit() { preinit_net_echo "Continuing with Regular Preinit\n" - pi_indicate_led + set_state preinit_regular } boot_hook_add preinit_main indicate_regular_preinit diff --git a/target/linux/adm5120/base-files/etc/diag.sh b/target/linux/adm5120/base-files/etc/diag.sh index f1317c5574d..08952bdaaaf 100755 --- a/target/linux/adm5120/base-files/etc/diag.sh +++ b/target/linux/adm5120/base-files/etc/diag.sh @@ -12,6 +12,9 @@ set_state() { failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on ;; diff --git a/target/linux/ar7/base-files/etc/diag.sh b/target/linux/ar7/base-files/etc/diag.sh index 37eed6a1a15..f6548e8d504 100644 --- a/target/linux/ar7/base-files/etc/diag.sh +++ b/target/linux/ar7/base-files/etc/diag.sh @@ -29,6 +29,9 @@ set_state() { failsafe) status_led_set_timer 50 50 ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) [ "$status_led" = "status" ] && { status_led_set_heartbeat diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index c022013f8f3..63e1ca6c860 100755 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -305,6 +305,9 @@ set_state() { failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on case $(ar71xx_board_name) in diff --git a/target/linux/avr32/base-files/etc/diag.sh b/target/linux/avr32/base-files/etc/diag.sh index f7604ae7158..38cd1896819 100755 --- a/target/linux/avr32/base-files/etc/diag.sh +++ b/target/linux/avr32/base-files/etc/diag.sh @@ -15,6 +15,10 @@ set_state() { status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; + done) status_led_on ;; diff --git a/target/linux/bcm53xx/base-files/etc/diag.sh b/target/linux/bcm53xx/base-files/etc/diag.sh index 05ac9e8374f..0a8c5fbcdbf 100644 --- a/target/linux/bcm53xx/base-files/etc/diag.sh +++ b/target/linux/bcm53xx/base-files/etc/diag.sh @@ -33,6 +33,9 @@ set_state() { failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on ;; diff --git a/target/linux/brcm47xx/base-files/etc/diag.sh b/target/linux/brcm47xx/base-files/etc/diag.sh index 539af36c51e..67453e6fd4e 100644 --- a/target/linux/brcm47xx/base-files/etc/diag.sh +++ b/target/linux/brcm47xx/base-files/etc/diag.sh @@ -31,6 +31,9 @@ set_state() { failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on ;; diff --git a/target/linux/brcm63xx/base-files/etc/diag.sh b/target/linux/brcm63xx/base-files/etc/diag.sh index bbf5c0b2e8e..f6a65d11075 100755 --- a/target/linux/brcm63xx/base-files/etc/diag.sh +++ b/target/linux/brcm63xx/base-files/etc/diag.sh @@ -12,6 +12,9 @@ set_state() { failsafe) status_led_set_timer 50 50 ;; + preinit_regular) + status_led_set_timer 500 500 + ;; done) if [ "${status_led/power}" != "$status_led" ]; then status_led_on diff --git a/target/linux/cns21xx/base-files/etc/diag.sh b/target/linux/cns21xx/base-files/etc/diag.sh index 292ddb757ad..d61f467267e 100755 --- a/target/linux/cns21xx/base-files/etc/diag.sh +++ b/target/linux/cns21xx/base-files/etc/diag.sh @@ -22,6 +22,9 @@ set_state() { failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on ;; diff --git a/target/linux/kirkwood/base-files/etc/diag.sh b/target/linux/kirkwood/base-files/etc/diag.sh index bd6bd98cadf..b2bb5835ae8 100755 --- a/target/linux/kirkwood/base-files/etc/diag.sh +++ b/target/linux/kirkwood/base-files/etc/diag.sh @@ -22,6 +22,9 @@ set_state() { failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on ;; diff --git a/target/linux/mpc85xx/base-files/etc/diag.sh b/target/linux/mpc85xx/base-files/etc/diag.sh index 123a90dbaec..1107763a378 100755 --- a/target/linux/mpc85xx/base-files/etc/diag.sh +++ b/target/linux/mpc85xx/base-files/etc/diag.sh @@ -24,6 +24,10 @@ set_state() { status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; + done) status_led_on ;; diff --git a/target/linux/mvebu/base-files/etc/diag.sh b/target/linux/mvebu/base-files/etc/diag.sh index 07570b9188b..adba975eded 100755 --- a/target/linux/mvebu/base-files/etc/diag.sh +++ b/target/linux/mvebu/base-files/etc/diag.sh @@ -22,6 +22,9 @@ set_state() { failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on ;; diff --git a/target/linux/mxs/base-files/etc/diag.sh b/target/linux/mxs/base-files/etc/diag.sh index 683e1234d58..11b1f75fae3 100644 --- a/target/linux/mxs/base-files/etc/diag.sh +++ b/target/linux/mxs/base-files/etc/diag.sh @@ -28,6 +28,9 @@ set_state() { failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on ;; diff --git a/target/linux/oxnas/base-files/etc/diag.sh b/target/linux/oxnas/base-files/etc/diag.sh index ba42218049f..5370696b44d 100755 --- a/target/linux/oxnas/base-files/etc/diag.sh +++ b/target/linux/oxnas/base-files/etc/diag.sh @@ -28,6 +28,9 @@ set_state() { failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on ;; diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index f50ae1fe7ff..1af64b27709 100755 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -227,6 +227,9 @@ set_state() { failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on ;;