summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-10-11 06:45:02 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-10-11 06:45:02 +0000
commitd3f22617a20127c4c2861bc86725d91958fa7953 (patch)
tree1b5f4404bf2a952615a01809fc84480bcea03bab
parentcd471b762f5774d541a0640414a7ed56e934cde5 (diff)
downloadmtk-20170518-d3f22617a20127c4c2861bc86725d91958fa7953.zip
mtk-20170518-d3f22617a20127c4c2861bc86725d91958fa7953.tar.gz
mtk-20170518-d3f22617a20127c4c2861bc86725d91958fa7953.tar.bz2
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
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/etc/init.d/led5
2 files changed, 6 insertions, 1 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 1d56e9f..27ce051 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 43964bf..f3f3c3f 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 ] && {