From: Rafał Miłecki <rafal@milecki.pl>
Date: Thu, 20 May 2021 08:32:18 +0000 (+0200)
Subject: base-files: generate bridge device sections with br- name prefix
X-Git-Tag: v21.02.0-rc2~6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0d90023633248791bbeb8d2b21669c1f9a5a9a6a;p=openwrt%2Fstaging%2Fhauke.git

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: 43fc720657c6 ("base-files: generate "device" UCI type section for bridge")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 0e459668c5b3b158991803204f628b1b7dce9034)
---

diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 0f6f280cf0..efcd734242 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -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=
 	}