Skip to content

Commit

Permalink
base-files: generate bridge device sections with br- name prefix
Browse files Browse the repository at this point in the history
Missing br- prefix could result in name conflict between DSA port
interface and bridge interface. Some devices with just one LAN port use
"lan" interface name for DSA port. Trying to create bridge with the same
"lan" name was failing.

Reported-by: David Bauer <mail@david-bauer.net>
Fixes: 43fc720 ("base-files: generate "device" UCI type section for bridge")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  • Loading branch information
Rafał Miłecki committed May 20, 2021
1 parent b810d64 commit 0e45966
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions package/base-files/files/bin/config_generate
Expand Up @@ -112,11 +112,11 @@ generate_network() {
[ -n "$ports" ] && {
uci -q batch <<-EOF
add network device
set network.@device[-1].name='$1'
set network.@device[-1].name='br-$1'
set network.@device[-1].type='bridge'
EOF
for port in $ports; do uci add_list network.@device[-1].ports="$port"; done
ifname=$1
ifname=br-$1
type=
}

Expand Down

0 comments on commit 0e45966

Please sign in to comment.