From 019ea725aad8481c34aaa8b7561c3f9ba6d79e1d Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 15 Dec 2014 10:37:00 +0000 Subject: add "preinit_regular" diag.sh set_state argument MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This new argument is used right after starting regular preinit (which happens if failsafe wasn't triggered). The main purpose of "preinit" argument is to indicate that failsafe can be triggered, however we were missing a way to inform user that we don't wait for a trigger anymore. With this change it's clear when failsafe mode can be triggered. Signed-off-by: Rafał Miłecki SVN-Revision: 43715 --- package/base-files/files/lib/functions/leds.sh | 4 ++++ package/base-files/files/lib/preinit/10_indicate_preinit | 6 +----- package/base-files/files/lib/preinit/50_indicate_regular_preinit | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'package/base-files/files/lib') diff --git a/package/base-files/files/lib/functions/leds.sh b/package/base-files/files/lib/functions/leds.sh index 743c7da782..4ac81455fa 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 900911606a..8e94df9ab2 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 bc223b358e..5b7523f6fd 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 -- cgit v1.2.3