generate_bridge() {
local name=$1
+ local macaddr=$2
uci -q batch <<-EOF
set network.$name=device
set network.$name.name=$name
set network.$name.type=bridge
EOF
+ if [ -n "$macaddr" ]; then
+ uci -q batch <<-EOF
+ set network.$name.macaddr=$macaddr
+ EOF
+ fi
}
bridge_vlan_id=0
local name=$1_vlan
local device=$2
local ports="$3"
- bridge_vlan_id=$((bridge_vlan_id + 1))
+ local vlan="$4"
uci -q batch <<-EOF
set network.$name=bridge-vlan
set network.$name.device='$device'
- set network.$name.vlan='$bridge_vlan_id'
+ set network.$name.vlan='$vlan'
set network.$name.ports='$ports'
EOF
}
uci -q batch <<-EOF
delete network.loopback
set network.loopback='interface'
- set network.loopback.ifname='lo'
+ set network.loopback.device='lo'
set network.loopback.proto='static'
set network.loopback.ipaddr='127.0.0.1'
set network.loopback.netmask='255.0.0.0'
addr_offset=2
generate_network() {
- local ifname macaddr protocol type ipaddr netmask
+ local ports device macaddr protocol type ipaddr netmask vlan
local bridge=$2
json_select network
json_select "$1"
- json_get_vars ifname macaddr protocol ipaddr netmask
+ json_get_vars device macaddr protocol ipaddr netmask vlan
+ json_get_values ports ports
json_select ..
json_select ..
- [ -n "$ifname" ] || return
+ [ -n "$device" -o -n "$ports" ] || return
- # force bridge for multi-interface devices (and lan)
- case "$1:$ifname" in
- *\ * | lan:*) type="bridge" ;;
- esac
+ # Force bridge for "lan" as it may have other devices (e.g. wireless)
+ # bridged
+ [ "$1" = "lan" -a -z "$ports" ] && {
+ ports="$device"
+ }
+
+ [ -n "$ports" -a -z "$bridge" ] && {
+ uci -q batch <<-EOF
+ add network device
+ set network.@device[-1].name='br-$1'
+ set network.@device[-1].type='bridge'
+ set network.@device[-1].macaddr='$macaddr'
+ EOF
+ for port in $ports; do uci add_list network.@device[-1].ports="$port"; done
+ device=br-$1
+ type=
+ macaddr=""
+ }
[ -n "$bridge" ] && {
- generate_bridge_vlan $1 $bridge "$ifname"
- ifname=$bridge.$bridge_vlan_id
+ [ -z "$ports" ] && ports="$device"
+ if [ -z "$vlan" ]; then
+ bridge_vlan_id=$((bridge_vlan_id + 1))
+ vlan=$bridge_vlan_id
+ fi
+ generate_bridge_vlan $1 $bridge "$ports" $vlan
+ device=$bridge.$vlan
type=""
}
delete network.$1
set network.$1='interface'
set network.$1.type='$type'
- set network.$1.ifname='$ifname'
+ set network.$1.device='$device'
set network.$1.proto='none'
EOF
if [ -n "$macaddr" ]; then
- for name in $ifname; do
+ for name in $device; do
uci -q batch <<-EOF
delete network.$1_${name/./_}_dev
set network.$1_${name/./_}_dev='device'
dhcp)
# fixup IPv6 slave interface if parent is a bridge
- [ "$type" = "bridge" ] && ifname="br-$1"
+ [ "$type" = "bridge" ] && device="br-$1"
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.device='$device'
set network.${1}6.proto='dhcpv6'
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.device='@${1}'
set network.${1}6.proto='dhcpv6'
EOF
}
umask 077
if [ ! -s /etc/config/network ]; then
+ bridge_name=""
touch /etc/config/network
generate_static_network
json_get_vars bridge
- [ -n "$bridge" ] && generate_bridge $bridge
+ [ -n "$bridge" ] && {
+ json_select bridge
+ json_get_vars name macaddr
+ generate_bridge "$name" "$macaddr"
+ json_select ..
+ bridge_name=$name
+ }
json_get_keys keys network
- for key in $keys; do generate_network $key $bridge; done
+ for key in $keys; do generate_network $key $bridge_name; done
json_get_keys keys switch
for key in $keys; do generate_switch $key; done