diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-14 15:41:16 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-14 15:41:16 +0000 |
| commit | 7fc94810d3cbe8770b2edbcb8a3c59a9dcf9ad83 (patch) | |
| tree | 0b8837896cc1662e7873ce0cee2413140ddd38a3 /target/linux/ar7/base-files/etc | |
| parent | 8110efa0d3f3a5f1794fe19457de34b1084849d1 (diff) | |
| download | openwrt-7fc94810d3cbe8770b2edbcb8a3c59a9dcf9ad83.tar.gz openwrt-7fc94810d3cbe8770b2edbcb8a3c59a9dcf9ad83.zip | |
attitude_adjustment: backport ar7 changes r33744 to r33756 changes
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@33764 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar7/base-files/etc')
| -rw-r--r-- | target/linux/ar7/base-files/etc/config/network | 2 | ||||
| -rw-r--r-- | target/linux/ar7/base-files/etc/diag.sh | 26 |
2 files changed, 21 insertions, 7 deletions
diff --git a/target/linux/ar7/base-files/etc/config/network b/target/linux/ar7/base-files/etc/config/network index 9ba0e6d29..0576aa437 100644 --- a/target/linux/ar7/base-files/etc/config/network +++ b/target/linux/ar7/base-files/etc/config/network @@ -8,7 +8,7 @@ config interface loopback config interface lan option type bridge - option ifname "eth0 eth1" + option ifname "eth0 eth1 eth0.1 eth0.2" option proto static option ipaddr 192.168.1.1 option netmask 255.255.255.0 diff --git a/target/linux/ar7/base-files/etc/diag.sh b/target/linux/ar7/base-files/etc/diag.sh index b8e4dc874..25ec89934 100644 --- a/target/linux/ar7/base-files/etc/diag.sh +++ b/target/linux/ar7/base-files/etc/diag.sh @@ -1,13 +1,16 @@ #!/bin/sh -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2012 OpenWrt.org # This setup gives us 4.5 distinguishable states: # -# Solid OFF: Bootloader running, or kernel hung (timer task stalled) -# Solid ON: Kernel hung (timer task stalled) -# 5Hz blink: preinit -# 10Hz blink: failsafe -# Heartbeat: normal operation +# (1-LED) Solid OFF: Bootloader running, or kernel hung (timer task stalled) +# (1-LED) Solid ON: Kernel hung (timer task stalled) +# (2-LED) Solid RED: Bootloader running, or kernel hung (timer task stalled) +# (2-LED) Solid YELLOW: Kernel hung (timer task stalled) +# 5Hz blink: preinit +# 10Hz blink: failsafe +# (1-LED) Heartbeat: normal operation +# (2-LED) Solid GREEN: normal operation set_state() { case "$1" in @@ -16,6 +19,10 @@ set_state() { echo timer >/sys/class/leds/status/trigger echo 100 >/sys/class/leds/status/delay_on echo 100 >/sys/class/leds/status/delay_off + :; } || [ -d /sys/class/leds/power\:green ] && { + echo timer >/sys/class/leds/power\:green/trigger + echo 100 >/sys/class/leds/power\:green/delay_on + echo 100 >/sys/class/leds/power\:green/delay_off } ;; failsafe) @@ -23,11 +30,18 @@ set_state() { echo timer >/sys/class/leds/status/trigger echo 50 >/sys/class/leds/status/delay_on echo 50 >/sys/class/leds/status/delay_off + :; } || [ -d /sys/class/leds/power\:green ] && { + echo timer >/sys/class/leds/power\:green/trigger + echo 50 >/sys/class/leds/power\:green/delay_on + echo 50 >/sys/class/leds/power\:green/delay_off } ;; done) [ -d /sys/class/leds/status ] && { echo heartbeat >/sys/class/leds/status/trigger + :; } || [ -d /sys/class/leds/power\:green ] && { + echo default-on >/sys/class/leds/power\:green/trigger + echo none >/sys/class/leds/power\:red/trigger } ;; esac |