base-files: fix configuration generation of network if "bridge" exists
authorINAGAKI Hiroshi <musashino.open@gmail.com>
Sun, 23 May 2021 11:30:58 +0000 (20:30 +0900)
committerRafał Miłecki <rafal@milecki.pl>
Mon, 24 May 2021 07:09:00 +0000 (09:09 +0200)
commit8cc4e87a2f81df02dbe481759ae6c36cf056c13b
treeee12309d5f828bcd074eefdec885bc8f30931e75
parent7a90ad3c431031191afe51b163bf97d3ec820d54
base-files: fix configuration generation of network if "bridge" exists

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>
package/base-files/files/bin/config_generate