diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2021-05-20 10:32:18 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2021-05-27 11:39:15 +0200 |
| commit | 0d90023633248791bbeb8d2b21669c1f9a5a9a6a (patch) | |
| tree | e6d8e53cbcc4bfb337fed8d7f1a9780216f61bfb /package/base-files/files/bin | |
| parent | 892fc7caa9eee9f5ef9e172677f871c02841bae8 (diff) | |
| download | upstream-0d90023633248791bbeb8d2b21669c1f9a5a9a6a.tar.gz upstream-0d90023633248791bbeb8d2b21669c1f9a5a9a6a.tar.bz2 upstream-0d90023633248791bbeb8d2b21669c1f9a5a9a6a.zip | |
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)
Diffstat (limited to 'package/base-files/files/bin')
| -rwxr-xr-x | package/base-files/files/bin/config_generate | 4 |
1 files changed, 2 insertions, 2 deletions
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= } |