base-files: generate config files with correct permissions

[openwrt/staging/stintel.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 fa148685ccc6de0108b75d5e5268b1a4cfbd4615..abb1388ba15dac23800b9dbb158296a8fbabefc6 100755 (executable)
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -15,10 +15,14 @@ generate_static_network() {
                set network.loopback.proto='static'
                set network.loopback.ipaddr='127.0.0.1'
                set network.loopback.netmask='255.0.0.0'
-               delete network.globals
-               set network.globals='globals'
-               set network.globals.ula_prefix='auto'
        EOF
+               [ -e /proc/sys/net/ipv6 ] && {
+                       uci -q batch <<-EOF
+                               delete network.globals
+                               set network.globals='globals'
+                               set network.globals.ula_prefix='auto'
+                       EOF
+               }
 
        if json_is_a dsl object; then
                json_select dsl
@@ -81,12 +85,16 @@ generate_network() {
                set network.$1.proto='none'
        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
+       if [ -n "$macaddr" ]; then
+               for name in $ifname; do
+                       uci -q batch <<-EOF
+                               delete network.$1_${name/./_}_dev
+                               set network.$1_${name/./_}_dev='device'
+                               set network.$1_${name/./_}_dev.name='$name'
+                               set network.$1_${name/./_}_dev.macaddr='$macaddr'
+                       EOF
+               done
+       fi
 
        case "$protocol" in
                static)
@@ -102,21 +110,23 @@ generate_network() {
                                set network.$1.proto='static'
                                set network.$1.ipaddr='$ipad'
                                set network.$1.netmask='$netm'
-                               set network.$1.ip6assign='60'
                        EOF
+                       [ -e /proc/sys/net/ipv6 ] && uci set network.$1.ip6assign='60'
                ;;
 
                dhcp)
                        # fixup IPv6 slave interface if parent is a bridge
                        [ "$type" = "bridge" ] && ifname="br-$1"
 
-                       uci -q batch <<-EOF
-                               set network.$1.proto='dhcp'
-                               delete network.${1}6
-                               set network.${1}6='interface'
-                               set network.${1}6.ifname='$ifname'
-                               set network.${1}6.proto='dhcpv6'
-                       EOF
+                       uci set network.$1.proto='dhcp'
+                       [ -e /proc/sys/net/ipv6 ] && {
+                               uci -q batch <<-EOF
+                                       delete network.${1}6
+                                       set network.${1}6='interface'
+                                       set network.${1}6.ifname='$ifname'
+                                       set network.${1}6.proto='dhcpv6'
+                               EOF
+                       }
                ;;
 
                pppoe)
@@ -124,12 +134,16 @@ generate_network() {
                                set network.$1.proto='pppoe'
                                set network.$1.username='username'
                                set network.$1.password='password'
-                               set network.$1.ipv6='1'
-                               delete network.${1}6
-                               set network.${1}6='interface'
-                               set network.${1}6.ifname='@${1}'
-                               set network.${1}6.proto='dhcpv6'
                        EOF
+                       [ -e /proc/sys/net/ipv6 ] && {
+                               uci -q batch <<-EOF
+                                       set network.$1.ipv6='1'
+                                       delete network.${1}6
+                                       set network.${1}6='interface'
+                                       set network.${1}6.ifname='@${1}'
+                                       set network.${1}6.proto='dhcpv6'
+                               EOF
+                       }
                ;;
        esac
 }
@@ -203,7 +217,8 @@ generate_switch() {
 
        json_select switch
        json_select "$key"
-       json_get_vars enable reset blinkrate cpu_port
+       json_get_vars enable reset blinkrate cpu_port \
+               ar8xxx_mib_type ar8xxx_mib_poll_interval
 
        uci -q batch <<-EOF
                add network switch
@@ -211,6 +226,8 @@ generate_switch() {
                set network.@switch[-1].reset='$reset'
                set network.@switch[-1].enable_vlan='$enable'
                set network.@switch[-1].blinkrate='$blinkrate'
+               set network.@switch[-1].ar8xxx_mib_type='$ar8xxx_mib_type'
+               set network.@switch[-1].ar8xxx_mib_poll_interval='$ar8xxx_mib_poll_interval'
        EOF
 
        generate_switch_vlans_ports "$1"
@@ -356,11 +373,12 @@ generate_led() {
                ;;
 
                switch)
-                       local port_mask speed_mask
-                       json_get_vars port_mask speed_mask
+                       local port_mask speed_mask mode
+                       json_get_vars port_mask speed_mask mode
                        uci -q batch <<-EOF
                                set system.$cfg.port_mask='$port_mask'
                                set system.$cfg.speed_mask='$speed_mask'
+                               set system.$cfg.mode='$mode'
                        EOF
                ;;
 
@@ -408,6 +426,8 @@ generate_gpioswitch() {
 json_init
 json_load "$(cat ${CFG})"
 
+umask 077
+
 if [ ! -s /etc/config/network ]; then
        touch /etc/config/network
        generate_static_network