This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via dd12d8c54c4ae52a8e334440c579bbf053429ce4 (commit) from 6a9d9ff4af5069314e5c49e799505dfef6380c4e (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit dd12d8c54c4ae52a8e334440c579bbf053429ce4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Dec 8 22:55:26 2019 +0100

leds: use new APUx ACPI Bios leds if exist.

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/139/filelists/files | 1 + src/initscripts/system/leds | 33 ++++++++++++++++++++++++------- 2 files changed, 27 insertions(+), 7 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/139/filelists/files b/config/rootfiles/core/139/filelists/files index 7a05c13fe..8a16facad 100644 --- a/config/rootfiles/core/139/filelists/files +++ b/config/rootfiles/core/139/filelists/files @@ -5,6 +5,7 @@ var/ipfire/langs etc/httpd/conf/vhosts.d/ipfire-interface.conf etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf etc/rc.d/init.d/functions +etc/rc.d/init.d/leds etc/rc.d/init.d/networking/dhcpcd.exe etc/rc.d/init.d/networking/red etc/rc.d/init.d/networking/functions.network diff --git a/src/initscripts/system/leds b/src/initscripts/system/leds index 3c3b4204a..08a73f6ba 100644 --- a/src/initscripts/system/leds +++ b/src/initscripts/system/leds @@ -60,6 +60,25 @@ enable_led () fi }

+#Handle new APU ACPI Leds introduced on APU2 with bios 4.10.0.0 +if [ -e /sys/class/leds/apu1:green:led1 ]; then + APULED="apu1:green:led"; +else if [ -e /sys/class/leds/apu2:green:led1 ]; then + APULED="apu2:green:led"; +else if [ -e /sys/class/leds/apu3:green:led1 ]; then + APULED="apu3:green:led"; +else if [ -e /sys/class/leds/apu4:green:led1 ]; then + APULED="apu4:green:led"; +else if [ -e /sys/class/leds/apu5:green:led1 ]; then + APULED="apu5:green:led"; +else + APULED="apu:"; +fi +fi +fi +fi +fi + case "${1}" in start) # Alix LED start @@ -68,9 +87,9 @@ case "${1}" in setup_netdev_trigger alix:3 ${RED_DEV} tx

# Apu LED start - setup_heartbeat_trigger apu:1 - setup_netdev_trigger apu:2 ${RED_DEV} rx - setup_netdev_trigger apu:3 ${RED_DEV} tx + setup_heartbeat_trigger ${APULED}1 + setup_netdev_trigger ${APULED}2 ${RED_DEV} rx + setup_netdev_trigger ${APULED}3 ${RED_DEV} tx

# Geos LED start setup_heartbeat_trigger geos:1 @@ -115,10 +134,10 @@ case "${1}" in disable_led_trigger alix:3

# Apu LED stop - disable_led_trigger apu:1 - enable_led apu:1 - disable_led_trigger apu:2 - disable_led_trigger apu:3 + disable_led_trigger ${APULED}1 + enable_led ${APULED}1 + disable_led_trigger ${APULED}2 + disable_led_trigger ${APULED}3

# Geos LED stop disable_led_trigger geos:1

hooks/post-receive -- IPFire 2.x development tree