aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2016-02-26 14:49:17 +0000
committerJo-Philipp Wich <jow@openwrt.org>2016-02-26 14:49:17 +0000
commiteced3b3a355199e1a1b51cba41689d9336d95c40 (patch)
tree84c0da0193f4b0a9b1c646eebb59596528d441cf
parent578e8d6c588d7bf3875e395548d6f78a1e71208a (diff)
downloadupstream-eced3b3a355199e1a1b51cba41689d9336d95c40.tar.gz
upstream-eced3b3a355199e1a1b51cba41689d9336d95c40.tar.bz2
upstream-eced3b3a355199e1a1b51cba41689d9336d95c40.zip
base-files: support passing mode to ucidef_set_led_netdev()
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 48806
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/bin/config_generate6
-rwxr-xr-xpackage/base-files/files/lib/functions/uci-defaults.sh2
3 files changed, 6 insertions, 4 deletions
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 ..