From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 26 Nov 2015 13:53:02 +0000 (+0000)
Subject: base-files: config_generate: regroup led generator code
X-Git-Tag: reboot~1398
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=aa4c5fd2b0a7c68853970b3b25717fafdf8eb8da;p=openwrt%2Fstaging%2Fjogo.git

base-files: config_generate: regroup led generator code

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

SVN-Revision: 47659
---

diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 45bf77b5cf..a0ff53a72c 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -293,36 +293,40 @@ generate_led() {
 
 	json_select led
 	json_select "$key"
-	json_get_vars name sysfs type trigger device default port_mask
+	json_get_vars name sysfs type trigger default
 
 	uci -q batch <<-EOF
 		delete system.$cfg
 		set system.$cfg='led'
 		set system.$cfg.name='$name'
 		set system.$cfg.sysfs='$sysfs'
-		set system.$cfg.dev='$device'
 		set system.$cfg.trigger='$trigger'
-		set system.$cfg.port_mask='$port_mask'
 		set system.$cfg.default='$default'
 	EOF
 
 	case "$type" in
 		netdev)
+			local device
+			json_get_vars device
 			uci -q batch <<-EOF
 				set system.$cfg.trigger='netdev'
 				set system.$cfg.mode='link tx rx'
+				set system.$cfg.dev='$device'
 			EOF
 		;;
 
 		usb)
+			local device
+			json_get_vars device
 			uci -q batch <<-EOF
 				set system.$cfg.trigger='usbdev'
 				set system.$cfg.interval='50'
+				set system.$cfg.dev='$device'
 			EOF
 		;;
 
 		rssi)
-			local minq maxq offset factor
+			local iface minq maxq offset factor
 			json_get_vars iface minq maxq offset factor
 			uci -q batch <<-EOF
 				set system.$cfg.trigger='rssi'
@@ -333,6 +337,14 @@ generate_led() {
 				set system.$cfg.factor='$factor'
 			EOF
 		;;
+
+		switch)
+			local port_mask
+			json_get_vars port_mask
+			uci -q batch <<-EOF
+				set system.$cfg.port_mask='$port_mask'
+			EOF
+		;;
 	esac
 
 	json_select ..