Author: blogic Date: 2014-12-15 11:37:00 +0100 (Mon, 15 Dec 2014) New Revision: 43715
Modified: trunk/package/base-files/files/lib/functions/leds.sh trunk/package/base-files/files/lib/preinit/10_indicate_preinit trunk/package/base-files/files/lib/preinit/50_indicate_regular_preinit trunk/target/linux/adm5120/base-files/etc/diag.sh trunk/target/linux/ar7/base-files/etc/diag.sh trunk/target/linux/ar71xx/base-files/etc/diag.sh trunk/target/linux/avr32/base-files/etc/diag.sh trunk/target/linux/bcm53xx/base-files/etc/diag.sh trunk/target/linux/brcm47xx/base-files/etc/diag.sh trunk/target/linux/brcm63xx/base-files/etc/diag.sh trunk/target/linux/cns21xx/base-files/etc/diag.sh trunk/target/linux/kirkwood/base-files/etc/diag.sh trunk/target/linux/mpc85xx/base-files/etc/diag.sh trunk/target/linux/mvebu/base-files/etc/diag.sh trunk/target/linux/mxs/base-files/etc/diag.sh trunk/target/linux/oxnas/base-files/etc/diag.sh trunk/target/linux/ramips/base-files/etc/diag.sh Log: add "preinit_regular" diag.sh set_state argument 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?\197?\130 Mi?\197?\130ecki <[email protected]> Modified: trunk/package/base-files/files/lib/functions/leds.sh =================================================================== --- trunk/package/base-files/files/lib/functions/leds.sh 2014-12-15 09:59:44 UTC (rev 43714) +++ trunk/package/base-files/files/lib/functions/leds.sh 2014-12-15 10:37:00 UTC (rev 43715) @@ -66,3 +66,7 @@ status_led_blink_failsafe() { led_timer $status_led 50 50 } + +status_led_blink_preinit_regular() { + led_timer $status_led 500 500 +} Modified: trunk/package/base-files/files/lib/preinit/10_indicate_preinit =================================================================== --- trunk/package/base-files/files/lib/preinit/10_indicate_preinit 2014-12-15 09:59:44 UTC (rev 43714) +++ trunk/package/base-files/files/lib/preinit/10_indicate_preinit 2014-12-15 10:37:00 UTC (rev 43715) @@ -36,13 +36,9 @@ 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 Modified: trunk/package/base-files/files/lib/preinit/50_indicate_regular_preinit =================================================================== --- trunk/package/base-files/files/lib/preinit/50_indicate_regular_preinit 2014-12-15 09:59:44 UTC (rev 43714) +++ trunk/package/base-files/files/lib/preinit/50_indicate_regular_preinit 2014-12-15 10:37:00 UTC (rev 43715) @@ -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 Modified: trunk/target/linux/adm5120/base-files/etc/diag.sh =================================================================== --- trunk/target/linux/adm5120/base-files/etc/diag.sh 2014-12-15 09:59:44 UTC (rev 43714) +++ trunk/target/linux/adm5120/base-files/etc/diag.sh 2014-12-15 10:37:00 UTC (rev 43715) @@ -12,6 +12,9 @@ failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on ;; Modified: trunk/target/linux/ar7/base-files/etc/diag.sh =================================================================== --- trunk/target/linux/ar7/base-files/etc/diag.sh 2014-12-15 09:59:44 UTC (rev 43714) +++ trunk/target/linux/ar7/base-files/etc/diag.sh 2014-12-15 10:37:00 UTC (rev 43715) @@ -29,6 +29,9 @@ failsafe) status_led_set_timer 50 50 ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) [ "$status_led" = "status" ] && { status_led_set_heartbeat Modified: trunk/target/linux/ar71xx/base-files/etc/diag.sh =================================================================== --- trunk/target/linux/ar71xx/base-files/etc/diag.sh 2014-12-15 09:59:44 UTC (rev 43714) +++ trunk/target/linux/ar71xx/base-files/etc/diag.sh 2014-12-15 10:37:00 UTC (rev 43715) @@ -305,6 +305,9 @@ failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on case $(ar71xx_board_name) in Modified: trunk/target/linux/avr32/base-files/etc/diag.sh =================================================================== --- trunk/target/linux/avr32/base-files/etc/diag.sh 2014-12-15 09:59:44 UTC (rev 43714) +++ trunk/target/linux/avr32/base-files/etc/diag.sh 2014-12-15 10:37:00 UTC (rev 43715) @@ -15,6 +15,10 @@ status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; + done) status_led_on ;; Modified: trunk/target/linux/bcm53xx/base-files/etc/diag.sh =================================================================== --- trunk/target/linux/bcm53xx/base-files/etc/diag.sh 2014-12-15 09:59:44 UTC (rev 43714) +++ trunk/target/linux/bcm53xx/base-files/etc/diag.sh 2014-12-15 10:37:00 UTC (rev 43715) @@ -33,6 +33,9 @@ failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on ;; Modified: trunk/target/linux/brcm47xx/base-files/etc/diag.sh =================================================================== --- trunk/target/linux/brcm47xx/base-files/etc/diag.sh 2014-12-15 09:59:44 UTC (rev 43714) +++ trunk/target/linux/brcm47xx/base-files/etc/diag.sh 2014-12-15 10:37:00 UTC (rev 43715) @@ -31,6 +31,9 @@ failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on ;; Modified: trunk/target/linux/brcm63xx/base-files/etc/diag.sh =================================================================== --- trunk/target/linux/brcm63xx/base-files/etc/diag.sh 2014-12-15 09:59:44 UTC (rev 43714) +++ trunk/target/linux/brcm63xx/base-files/etc/diag.sh 2014-12-15 10:37:00 UTC (rev 43715) @@ -12,6 +12,9 @@ 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 Modified: trunk/target/linux/cns21xx/base-files/etc/diag.sh =================================================================== --- trunk/target/linux/cns21xx/base-files/etc/diag.sh 2014-12-15 09:59:44 UTC (rev 43714) +++ trunk/target/linux/cns21xx/base-files/etc/diag.sh 2014-12-15 10:37:00 UTC (rev 43715) @@ -22,6 +22,9 @@ failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on ;; Modified: trunk/target/linux/kirkwood/base-files/etc/diag.sh =================================================================== --- trunk/target/linux/kirkwood/base-files/etc/diag.sh 2014-12-15 09:59:44 UTC (rev 43714) +++ trunk/target/linux/kirkwood/base-files/etc/diag.sh 2014-12-15 10:37:00 UTC (rev 43715) @@ -22,6 +22,9 @@ failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on ;; Modified: trunk/target/linux/mpc85xx/base-files/etc/diag.sh =================================================================== --- trunk/target/linux/mpc85xx/base-files/etc/diag.sh 2014-12-15 09:59:44 UTC (rev 43714) +++ trunk/target/linux/mpc85xx/base-files/etc/diag.sh 2014-12-15 10:37:00 UTC (rev 43715) @@ -24,6 +24,10 @@ status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; + done) status_led_on ;; Modified: trunk/target/linux/mvebu/base-files/etc/diag.sh =================================================================== --- trunk/target/linux/mvebu/base-files/etc/diag.sh 2014-12-15 09:59:44 UTC (rev 43714) +++ trunk/target/linux/mvebu/base-files/etc/diag.sh 2014-12-15 10:37:00 UTC (rev 43715) @@ -22,6 +22,9 @@ failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on ;; Modified: trunk/target/linux/mxs/base-files/etc/diag.sh =================================================================== --- trunk/target/linux/mxs/base-files/etc/diag.sh 2014-12-15 09:59:44 UTC (rev 43714) +++ trunk/target/linux/mxs/base-files/etc/diag.sh 2014-12-15 10:37:00 UTC (rev 43715) @@ -28,6 +28,9 @@ failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on ;; Modified: trunk/target/linux/oxnas/base-files/etc/diag.sh =================================================================== --- trunk/target/linux/oxnas/base-files/etc/diag.sh 2014-12-15 09:59:44 UTC (rev 43714) +++ trunk/target/linux/oxnas/base-files/etc/diag.sh 2014-12-15 10:37:00 UTC (rev 43715) @@ -28,6 +28,9 @@ failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on ;; Modified: trunk/target/linux/ramips/base-files/etc/diag.sh =================================================================== --- trunk/target/linux/ramips/base-files/etc/diag.sh 2014-12-15 09:59:44 UTC (rev 43714) +++ trunk/target/linux/ramips/base-files/etc/diag.sh 2014-12-15 10:37:00 UTC (rev 43715) @@ -227,6 +227,9 @@ failsafe) status_led_blink_failsafe ;; + preinit_regular) + status_led_blink_preinit_regular + ;; done) status_led_on ;; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
