From: Florian Fainelli <florian@openwrt.org>
Date: Thu, 11 Oct 2012 06:45:02 +0000 (+0000)
Subject: base-files: skip LEDs handled by rssileds in led init-script
X-Git-Tag: reboot~12658
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d3f22617a20127c4c2861bc86725d91958fa7953;p=openwrt%2Fstaging%2Fblogic.git

base-files: skip LEDs handled by rssileds in led init-script

Without this, /etc/init.d/led will try to set the non-existing 'rssi' trigger.
This doesn't harm as the kernel will refuse this setting, but it outputs some
ugly log-lines:
Jun 24 10:15:19 OpenWrt user.info sysinit: setting up led RSSILOW
Jun 24 10:15:19 OpenWrt user.info sysinit: sh: write error: Invalid argument
...

In order to avoid this, skip LEDs with trigger = "rssi" in /etc/init.d/led

Signed-off-by: Daniel Golle <dgolle@allnet.de>

SVN-Revision: 33717
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 1d56e9fc784f..27ce05164a52 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=117
+PKG_RELEASE:=118
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/etc/init.d/led b/package/base-files/files/etc/init.d/led
index 43964bf0bbe6..f3f3c3f8a7c9 100755
--- a/package/base-files/files/etc/init.d/led
+++ b/package/base-files/files/etc/init.d/led
@@ -25,6 +25,11 @@ load_led() {
 	config_get interval $1 interval "50"
 	config_get port_state $1 port_state
 
+	if [ "$trigger" = "rssi" ]; then
+		# handled by rssileds userspace process
+		return
+	fi
+
 	[ -e /sys/class/leds/${sysfs}/brightness ] && {
 		echo "setting up led ${name}"
 		[ "$default" != nil ] && {