From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 26 Feb 2016 14:49:17 +0000 (+0000)
Subject: base-files: support passing mode to ucidef_set_led_netdev()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=eced3b3a355199e1a1b51cba41689d9336d95c40;p=openwrt%2Fstaging%2Flinusw.git

base-files: support passing mode to ucidef_set_led_netdev()

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 48806
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 8c75b91940..8bb6225527 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:=167
+PKG_RELEASE:=168
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=usign/host
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 865dccc450..550de0eebf 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -263,11 +263,11 @@ generate_led() {
 		;;
 
 		netdev)
-			local device
-			json_get_vars device
+			local device mode
+			json_get_vars device mode
 			uci -q batch <<-EOF
 				set system.$cfg.trigger='netdev'
-				set system.$cfg.mode='link tx rx'
+				set system.$cfg.mode='$mode'
 				set system.$cfg.dev='$device'
 			EOF
 		;;
diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh
index d556844e95..512e0ed8bd 100755
--- a/package/base-files/files/lib/functions/uci-defaults.sh
+++ b/package/base-files/files/lib/functions/uci-defaults.sh
@@ -355,6 +355,7 @@ ucidef_set_led_netdev() {
 	local name="$2"
 	local sysfs="$3"
 	local dev="$4"
+	local mode="${5:-link tx rx}"
 
 	json_select_object led
 
@@ -363,6 +364,7 @@ ucidef_set_led_netdev() {
 	json_add_string type netdev
 	json_add_string sysfs "$sysfs"
 	json_add_string device "$dev"
+	json_add_string mode "$mode"
 	json_select ..
 
 	json_select ..