Browse Source

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 <[email protected]>

SVN-Revision: 33717
Florian Fainelli 13 năm trước cách đây
mục cha
commit
d3f22617a2
2 tập tin đã thay đổi với 6 bổ sung1 xóa
  1. 1 1
      package/base-files/Makefile
  2. 5 0
      package/base-files/files/etc/init.d/led

+ 1 - 1
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

+ 5 - 0
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 ] && {