base-files: generate bridge device sections with br- name prefix
authorRafał Miłecki <rafal@milecki.pl>
Thu, 20 May 2021 08:32:18 +0000 (10:32 +0200)
committerRafał Miłecki <rafal@milecki.pl>
Thu, 27 May 2021 09:39:15 +0000 (11:39 +0200)
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: 43fc720657c6 ("base-files: generate "device" UCI type section for bridge")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 0e459668c5b3b158991803204f628b1b7dce9034)

package/base-files/files/bin/config_generate

index 0f6f280..efcd734 100755 (executable)
@@ -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=
        }