Skip to content

Commit

Permalink
base-files: generate "device" UCI type section for bridge
Browse files Browse the repository at this point in the history
This switches from the old way of defining bridges in an "interface" UCI
section type (that should be used for layer 3 only). From now a defualt
board switch will have its own "device" UCI section type. It's a new &
preferred way of defining L2 devices.

Before:

config interface 'lan'
        option type 'bridge'
        option ifname 'lan1 lan2 lan3 lan4'
        option proto 'static'
        option ipaddr '192.168.1.1'
        option netmask '255.255.255.0'

After:

config device
        option name 'lan'
        option type 'bridge'
        list ports 'lan1'
        list ports 'lan2'
        list ports 'lan3'
        list ports 'lan4'

config interface 'lan'
        option ifname 'lan'
        option proto 'static'
        option ipaddr '192.168.1.1'
        option netmask '255.255.255.0'

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  • Loading branch information
Rafał Miłecki committed May 18, 2021
1 parent e884389 commit 43fc720
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions package/base-files/files/bin/config_generate
Expand Up @@ -110,8 +110,14 @@ generate_network() {
}

[ -n "$ports" ] && {
type="bridge"
ifname="$ports"
uci -q batch <<-EOF
add network device
set network.@device[-1].name='$1'
set network.@device[-1].type='bridge'
EOF
for port in $ports; do uci add_list network.@device[-1].ports="$port"; done
ifname=$1
type=
}

[ -n "$bridge" ] && {
Expand Down

0 comments on commit 43fc720

Please sign in to comment.