projects / openwrt / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
base-files: config_generate: split macaddr with multiple ifaces
[openwrt/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 7f34eec88130afa49e16bb249f9d205e4096406e..3bf48d72161f7ec1fd29327540a0e92be4385f3d 100755 (executable)
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -4,8 +4,8 @@ CFG=/etc/board.json
 
 . /usr/share/libubox/jshn.sh
 
-[ -f $CFG ] || exit 1
-[ -f /etc/config/network -a -f /etc/config/system ] && exit 0
+[ -s $CFG ] || /bin/board_detect || exit 1
+[ -s /etc/config/network -a -s /etc/config/system ] && exit 0
 
 generate_static_network() {
        uci -q batch <<-EOF
@@ -15,17 +15,21 @@ 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
                        if json_is_a atmbridge object; then
                                json_select atmbridge
-                                       local vpi vci encaps payload
-                                       json_get_vars vpi vci encaps payload
+                                       local vpi vci encaps payload nameprefix
+                                       json_get_vars vpi vci encaps payload nameprefix
                                        uci -q batch <<-EOF
                                                delete network.atm
                                                set network.atm='atm-bridge'
@@ -33,6 +37,7 @@ generate_static_network() {
                                                set network.atm.vci='$vci'
                                                set network.atm.encaps='$encaps'
                                                set network.atm.payload='$payload'
+                                               set network.atm.nameprefix='$nameprefix'
                                        EOF
                                json_select ..
                        fi
@@ -80,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)
@@ -101,37 +110,40 @@ 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)
-                       # 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
+                       [ -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
 }
@@ -205,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
@@ -213,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"
@@ -226,7 +241,7 @@ generate_static_system() {
        uci -q batch <<-EOF
                delete system.@system[0]
                add system system
-               set system.@system[-1].hostname='lede'
+               set system.@system[-1].hostname='OpenWrt'
                set system.@system[-1].timezone='UTC'
                set system.@system[-1].ttylogin='0'
                set system.@system[-1].log_size='64'
@@ -236,10 +251,10 @@ generate_static_system() {
                set system.ntp='timeserver'
                set system.ntp.enabled='1'
                set system.ntp.enable_server='0'
-               add_list system.ntp.server='0.lede.pool.ntp.org'
-               add_list system.ntp.server='1.lede.pool.ntp.org'
-               add_list system.ntp.server='2.lede.pool.ntp.org'
-               add_list system.ntp.server='3.lede.pool.ntp.org'
+               add_list system.ntp.server='0.openwrt.pool.ntp.org'
+               add_list system.ntp.server='1.openwrt.pool.ntp.org'
+               add_list system.ntp.server='2.openwrt.pool.ntp.org'
+               add_list system.ntp.server='3.openwrt.pool.ntp.org'
        EOF
 
        if json_is_a system object; then
@@ -335,6 +350,15 @@ generate_led() {
                        EOF
                ;;
 
+               usbport)
+                       local ports port
+                       json_get_values ports ports
+                       uci set system.$cfg.trigger='usbport'
+                       for port in $ports; do
+                               uci add_list system.$cfg.port=$port
+                       done
+               ;;
+
                rssi)
                        local iface minq maxq offset factor
                        json_get_vars iface minq maxq offset factor
@@ -349,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
                ;;
 
@@ -392,7 +417,7 @@ generate_gpioswitch() {
                                set system.$cfg='gpio_switch'
                                set system.$cfg.name='$name'
                                set system.$cfg.gpio_pin='$pin'
-                               set system.$cfg.default='$default'
+                               set system.$cfg.value='$default'
                        EOF
                json_select ..
        json_select ..
@@ -401,7 +426,7 @@ generate_gpioswitch() {
 json_init
 json_load "$(cat ${CFG})"
 
-if [ ! -f /etc/config/network ]; then
+if [ ! -s /etc/config/network ]; then
        touch /etc/config/network
        generate_static_network
 
@@ -412,7 +437,7 @@ if [ ! -f /etc/config/network ]; then
        for key in $keys; do generate_switch $key; done
 fi
 
-if [ ! -f /etc/config/system ]; then
+if [ ! -s /etc/config/system ]; then
        touch /etc/config/system
        generate_static_system
 
OpenWrt Source Repository