ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-04-11 21:31:54 +00:00
Code Issues Actions3 Packages Projects Releases Wiki Activity

base-files: fix configuration generation of network if "bridge" exists

Browse Source 
After the commit 43fc720657c6e3b30c6ed89d7227ee6e646c158b
("base-files: generate "device UCI type section for bridge"), the wrong
network configuration is generated for the devices that already have the
bridge device section for VLAN, such as the devices in realtek target.

As a result, the bridge device by additional "device" section is
specified to the "ports" option in the "bridge-vlan" section and netifd
shuts down the switch and the ethernet when the network service started.

Fixes: 43fc720657 ("base-files: generate "device" UCI type section for bridge")
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
[rmilecki: use $ports for generate_bridge_vlan argument]
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
INAGAKI Hiroshi 2021-05-23 20:30:58 +09:00 committed by Rafał Miłecki
parent 7a90ad3c43
commit 8cc4e87a2f
1 changed files with 3 additions and 2 deletions

5
package/base-files/files/bin/config_generate

@ -109,7 +109,7 @@ generate_network() {
ports="$ifname"
}
[ -n "$ports" ] && {
[ -n "$ports" -a -z "$bridge" ] && {
uci -q batch <<-EOF
add network device
set network.@device[-1].name='br-$1'
@ -123,11 +123,12 @@ generate_network() {
}
[ -n "$bridge" ] && {
[ -z "$ports" ] && ports="$ifname"
if [ -z "$vlan" ]; then
bridge_vlan_id=$((bridge_vlan_id + 1))
vlan=$bridge_vlan_id
fi
generate_bridge_vlan $1 $bridge "$ifname" $vlan
generate_bridge_vlan $1 $bridge "$ports" $vlan
ifname=$bridge.$vlan
type=""
}