aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2021-06-14 20:18:14 +0200
committerRafał Miłecki <rafal@milecki.pl>2021-06-22 08:10:05 +0200
commit125deb4d783e548228e68f6e4b42b5eb84ba8b8c (patch)
treef4cc855ada985ac8f93b106d067b22dd2b629b04 /package
parente410ef838959c0d7cd9a6c0a13d5f2ca2b03c077 (diff)
downloadupstream-125deb4d783e548228e68f6e4b42b5eb84ba8b8c.tar.gz
upstream-125deb4d783e548228e68f6e4b42b5eb84ba8b8c.tar.bz2
upstream-125deb4d783e548228e68f6e4b42b5eb84ba8b8c.zip
base-files: set MAC for bridge ports (devices) instead of bridge itself
This restores the original config_generate behaviour. With MAC set for bridged devices the bridge automatically gets its MAC adjusted (it picks the lowest MAC of bridged devices). This fixes confusing interfaces setup (bridge ports not having custom MAC assigned). Reported-by: Koen Vandeputte <koen.vandeputte@citymesh.com> Fixes: c2139eef279e ("base-files: simplify setting device MAC") Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit c8d8eb9d13fc6fc8b394a620c27995ee71d29c4d)
Diffstat (limited to 'package')
-rwxr-xr-xpackage/base-files/files/bin/config_generate10
1 files changed, 9 insertions, 1 deletions
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 0dca5549e8..b3752c5430 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -114,9 +114,17 @@ 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
+ [ -n "macaddr" ] && {
+ for port in $ports; do
+ uci -q batch <<-EOF
+ add network device
+ set network.@device[-1].name='$port'
+ set network.@device[-1].macaddr='$macaddr'
+ EOF
+ done
+ }
device=br-$1
type=
macaddr=""