From: Rafał Miłecki <rafal@milecki.pl>
Date: Mon, 24 May 2021 05:46:12 +0000 (+0200)
Subject: base-files: support setting bridge MAC address
X-Git-Tag: v21.02.0-rc2~5
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=fc605c01f6d1fd8e2aa8ede83b03ae87f12524a9

base-files: support setting bridge MAC address

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

diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index efcd734242..604c49a709 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -114,10 +114,12 @@ generate_network() {
 			add network device
 			set network.@device[-1].name='br-$1'
 			set network.@device[-1].type='bridge'
+			set network.@device[-1].macaddr='$macaddr'
 		EOF
 		for port in $ports; do uci add_list network.@device[-1].ports="$port"; done
 		ifname=br-$1
 		type=
+		macaddr=""
 	}
 
 	[ -n "$bridge" ] && {