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

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>
(cherry picked from commit 0e459668c5)
This commit is contained in:
Rafał Miłecki 2021-05-20 10:32:18 +02:00
parent 892fc7caa9
commit 0d90023633

View File

@ -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=
}