base-files: support passing mode to ucidef_set_led_netdev()

[oweals/openwrt.git] / package / base-files / files / bin / config_generate

diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 02f6998c84dec4c0708dd159a8081f71f27a362b..550de0eebf80e5a95cf63bcdf86bf9ab196321e4 100755 (executable)
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -18,6 +18,40 @@ generate_static_network() {
                set network.globals='globals'
                set network.globals.ula_prefix='auto'
        EOF
+
+       if json_is_a dsl object; then
+               json_select dsl
+                       if json_is_a atmbridge object; then
+                               json_select atmbridge
+                                       local vpi vci encaps payload
+                                       json_get_vars vpi vci encaps payload
+                                       uci -q batch <<-EOF
+                                               delete network.atm
+                                               set network.atm='atm-bridge'
+                                               set network.atm.vpi='$vpi'
+                                               set network.atm.vci='$vci'
+                                               set network.atm.encaps='$encaps'
+                                               set network.atm.payload='$payload'
+                                       EOF
+                               json_select ..
+                       fi
+
+                       if json_is_a modem object; then
+                               json_select modem
+                                       local type annex firmware tone xfer_mode
+                                       json_get_vars type annex firmware tone xfer_mode
+                                       uci -q batch <<-EOF
+                                               delete network.dsl
+                                               set network.dsl='$type'
+                                               set network.dsl.annex='$annex'
+                                               set network.dsl.firmware='$firmware'
+                                               set network.dsl.tone='$tone'
+                                               set network.dsl.xfer_mode='$xfer_mode'
+                                       EOF
+                               json_select ..
+                       fi
+               json_select ..
+       fi
 }
 
 addr_offset=2
@@ -43,7 +77,13 @@ generate_network() {
                set network.$1.type='$type'
                set network.$1.ifname='$ifname'
                set network.$1.proto='none'
-               set network.$1.macaddr='$macaddr'
+       EOF
+
+       [ -n "$macaddr" ] && uci -q batch <<-EOF
+               delete network.$1_dev
+               set network.$1_dev='device'
+               set network.$1_dev.name='$ifname'
+               set network.$1_dev.macaddr='$macaddr'
        EOF
 
        case "$protocol" in
@@ -74,6 +114,22 @@ generate_network() {
                                set network.${1}6.proto='dhcpv6'
                        EOF
                ;;
+
+               pppoe)
+                       # fixup IPv6 slave interface
+                       ifname="pppoe-$1"
+
+                       uci -q batch <<-EOF
+                               set network.$1.proto='pppoe'
+                               set network.$1.username='username'
+                               set network.$1.password='password'
+                               set network.$1.ipv6='auto'
+                               delete network.${1}6
+                               set network.${1}6='interface'
+                               set network.${1}6.ifname='$ifname'
+                               set network.${1}6.proto='dhcpv6'
+                       EOF
+               ;;
        esac
 }
 
@@ -207,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
                ;;
@@ -240,18 +296,19 @@ generate_led() {
                ;;
 
                switch)
-                       local port_mask
-                       json_get_vars port_mask
+                       local port_mask speed_mask
+                       json_get_vars port_mask speed_mask
                        uci -q batch <<-EOF
                                set system.$cfg.port_mask='$port_mask'
+                               set system.$cfg.speed_mask='$speed_mask'
                        EOF
                ;;
 
-               timer)
+               timer|oneshot)
                        local delayon delayoff
                        json_get_vars delayon delayoff
                        uci -q batch <<-EOF
-                               set system.$cfg.trigger='timer'
+                               set system.$cfg.trigger='$type'
                                set system.$cfg.delayon='$delayon'
                                set system.$cfg.delayoff='$delayoff'
                        EOF
@@ -262,6 +319,24 @@ generate_led() {
        json_select ..
 }
 
+generate_gpioswitch() {
+       local cfg="$1"
+
+       json_select gpioswitch
+               json_select "$cfg"
+                       local name pin default
+                       json_get_vars name pin default
+                       uci -q batch <<-EOF
+                               delete system.$cfg
+                               set system.$cfg='gpio_switch'
+                               set system.$cfg.name='$name'
+                               set system.$cfg.gpio_pin='$pin'
+                               set system.$cfg.default='$default'
+                       EOF
+               json_select ..
+       json_select ..
+}
+
 json_init
 json_load "$(cat ${CFG})"
 
@@ -276,6 +351,9 @@ for key in $keys; do generate_switch $key; done
 json_get_keys keys rssimon
 for key in $keys; do generate_rssimon $key; done
 
+json_get_keys keys gpioswitch
+for key in $keys; do generate_gpioswitch $key; done
+
 json_get_keys keys led
 for key in $keys; do generate_led $key; done