Author: jow
Date: 2015-11-26 14:53:02 +0100 (Thu, 26 Nov 2015)
New Revision: 47659

Modified:
   trunk/package/base-files/files/bin/config_generate
Log:
base-files: config_generate: regroup led generator code

Signed-off-by: Jo-Philipp Wich <[email protected]>

Modified: trunk/package/base-files/files/bin/config_generate
===================================================================
--- trunk/package/base-files/files/bin/config_generate  2015-11-26 12:46:09 UTC 
(rev 47658)
+++ trunk/package/base-files/files/bin/config_generate  2015-11-26 13:53:02 UTC 
(rev 47659)
@@ -293,36 +293,40 @@
 
        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 @@
                                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 ..
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to