base-files: Fix config_generate when there are no switch VLANs or ports configured...

[openwrt/staging/dedeckeh.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 92eb14bb1117d7801392e9d37a3ac0e6091886d3..345393ca9cf92c6878e4d7e97953d1dff5045982 100755 (executable)
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -42,7 +42,7 @@ generate_static_network() {
                                        json_get_vars type annex firmware tone xfer_mode
                                        uci -q batch <<-EOF
                                                delete network.dsl
-                                               set network.dsl='$type'
+                                               set network.dsl='dsl'
                                                set network.dsl.annex='$annex'
                                                set network.dsl.firmware='$firmware'
                                                set network.dsl.tone='$tone'
@@ -56,11 +56,11 @@ generate_static_network() {
 
 addr_offset=2
 generate_network() {
-       local ifname macaddr protocol type
+       local ifname macaddr protocol type ipaddr netmask
 
        json_select network
                json_select "$1"
-                       json_get_vars ifname macaddr protocol
+                       json_get_vars ifname macaddr protocol ipaddr netmask
                json_select ..
        json_select ..
 
@@ -88,16 +88,18 @@ generate_network() {
 
        case "$protocol" in
                static)
-                       local ipaddr
+                       local ipad
                        case "$1" in
-                               lan) ipaddr="192.168.1.1" ;;
-                               *) ipaddr="192.168.$((addr_offset++)).1" ;;
+                               lan) ipad=${ipaddr:-"192.168.1.1"} ;;
+                               *) ipad=${ipaddr:-"192.168.$((addr_offset++)).1"} ;;
                        esac
 
+                       netm=${netmask:-"255.255.255.0"}
+
                        uci -q batch <<-EOF
                                set network.$1.proto='static'
-                               set network.$1.ipaddr='$ipaddr'
-                               set network.$1.netmask='255.255.255.0'
+                               set network.$1.ipaddr='$ipad'
+                               set network.$1.netmask='$netm'
                                set network.$1.ip6assign='60'
                        EOF
                ;;
@@ -141,55 +143,59 @@ generate_switch_vlans_ports() {
        # autogenerate vlans
        #
 
-       json_get_keys roles roles
-       json_select roles
+       if json_is_a roles array; then
+               json_get_keys roles roles
+               json_select roles
 
-       for role in $roles; do
-               json_select "$role"
-                       json_get_vars ports
-               json_select ..
+               for role in $roles; do
+                       json_select "$role"
+                               json_get_vars ports
+                       json_select ..
 
-               uci -q batch <<-EOF
-                       add network switch_vlan
-                       set network.@switch_vlan[-1].device='$switch'
-                       set network.@switch_vlan[-1].vlan='$role'
-                       set network.@switch_vlan[-1].ports='$ports'
-               EOF
-       done
+                       uci -q batch <<-EOF
+                               add network switch_vlan
+                               set network.@switch_vlan[-1].device='$switch'
+                               set network.@switch_vlan[-1].vlan='$role'
+                               set network.@switch_vlan[-1].ports='$ports'
+                       EOF
+               done
 
-       json_select ..
+               json_select ..
+       fi
 
 
        #
        # write port specific settings
        #
 
-       json_get_keys ports ports
-       json_select ports
-
-       for port in $ports; do
-               json_select "$port"
-                       json_get_vars num
-
-                       if json_is_a attr object; then
-                               json_get_keys attr attr
-                               json_select attr
-                                       uci -q batch <<-EOF
-                                               add network switch_port
-                                               set network.@switch_port[-1].device='$switch'
-                                               set network.@switch_port[-1].port=$num
-                                       EOF
+       if json_is_a ports array; then
+               json_get_keys ports ports
+               json_select ports
+
+               for port in $ports; do
+                       json_select "$port"
+                               json_get_vars num
+
+                               if json_is_a attr object; then
+                                       json_get_keys attr attr
+                                       json_select attr
+                                               uci -q batch <<-EOF
+                                                       add network switch_port
+                                                       set network.@switch_port[-1].device='$switch'
+                                                       set network.@switch_port[-1].port=$num
+                                               EOF
+
+                                               for attr in $attr; do
+                                                       json_get_var val "$attr"
+                                                       uci -q set network.@switch_port[-1].$attr="$val"
+                                               done
+                                       json_select ..
+                               fi
+                       json_select ..
+               done
 
-                                       for attr in $attr; do
-                                               json_get_var val "$attr"
-                                               uci -q set network.@switch_port[-1].$attr="$val"
-                                       done
-                               json_select ..
-                       fi
                json_select ..
-       done
-
-       json_select ..
+       fi
 }
 
 generate_switch() {
@@ -263,11 +269,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
                ;;
@@ -296,18 +302,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