wifitoggle: Do not generate error message in case of empty led_sysfs

While an empty led_sysfs definition works as intended (no LED state is
touched), an error message is generated, since the appropriate sysfs
interface does not exist:

          Sat Feb 27 16:42:55 2016 user.err wifitoggle: led:  not found

This patch makes sure that no such error message will be generated.

Signed-off-by: Karol Babioch <redacted>

diff --git a/utils/wifitoggle/Makefile b/utils/wifitoggle/Makefile
index 182f1db788946391494e1ed1ce918b91dccb3e7b..c580e97817efda21092789afed88b0f21c1b6387 100644 (file)
--- a/utils/wifitoggle/Makefile
+++ b/utils/wifitoggle/Makefile
@@ -1,6 +1,7 @@
 #
 # Copyright (C) 2010-2014 OpenWrt.org
 # Copyright (C) 2010 segal.di.ubi.pt
+# Copyright (C) 2016 Karol Babioch <karol@babioch.de>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,7 +11,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifitoggle
 PKG_VERSION:=1
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 PKG_LICENSE:=GPL-2.0+
 
 PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>

diff --git a/utils/wifitoggle/files/wifitoggle.config b/utils/wifitoggle/files/wifitoggle.config
index f3bec29ab7cc9d7da80e18c5250794f215a0f808..a8d090621db2185b03553bea944abc1dbc32ca9e 100755 (executable)
--- a/utils/wifitoggle/files/wifitoggle.config
+++ b/utils/wifitoggle/files/wifitoggle.config
@@ -4,7 +4,9 @@ config wifitoggle
        option persistent       '0' 
        option timer            '600'
 
-       option led_sysfs                'wrt160nl:amber:wps'
+       #option led_sysfs               'wrt160nl:amber:wps'
+       # Leaving this option empty, makes sure that no LED is touched
+       option led_sysfs                ''
        option led_enable_trigger       'timer' 
        option led_enable_delayon       '500'
        option led_enable_delayoff      '500'

diff --git a/utils/wifitoggle/files/wifitoggle.hotplug b/utils/wifitoggle/files/wifitoggle.hotplug
index d66db3f0a7ae8e95e11ace3030f10cfe47a5df8c..295a0871081a0d05710958129d9351461fcbc2f4 100755 (executable)
--- a/utils/wifitoggle/files/wifitoggle.hotplug
+++ b/utils/wifitoggle/files/wifitoggle.hotplug
@@ -1,7 +1,9 @@
 # /bin/sh
 
 setled() {
-        if [ -e /sys/class/leds/${led_sysfs}/brightness ]
+        if [ -z "${led_sysfs}" ]; then
+            return
+        elif [ -e /sys/class/leds/${led_sysfs}/brightness ]
        then
                 [ $led_default -eq 1 ] && echo 1 >/sys/class/leds/${led_sysfs}/brightness
                 [ $led_default -eq 1 ] || echo 0 >/sys/class/leds/${led_sysfs}/brightness