ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 13:48:06 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

base-files: generate bridge device sections with br- name prefix

Browse Source 
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: 43fc720657 ("base-files: generate "device" UCI type section for bridge")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki 2021-05-20 10:32:18 +02:00
parent b810d649fb
commit 0e459668c5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/base-files/files/bin/config_generate
View File

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