From 61ab78a50a6e6268868fdef29f4bfbae5606e666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Wed, 3 Apr 2024 22:32:35 -0400 Subject: [PATCH 1/2] incusd/network: Remove bridge.driver=native requirement for extended external_interfaces syntax MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- internal/server/network/driver_bridge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/server/network/driver_bridge.go b/internal/server/network/driver_bridge.go index 6178ba8f60a..ed6b6c8a154 100644 --- a/internal/server/network/driver_bridge.go +++ b/internal/server/network/driver_bridge.go @@ -763,7 +763,7 @@ func (n *bridge) setup(oldConfig map[string]string) error { ifParent := "" vlanID := 0 - if len(entryParts) == 3 && n.config["bridge.driver"] == "native" { + if len(entryParts) == 3 { vlanID, err = strconv.Atoi(entryParts[2]) if err != nil || vlanID < 1 || vlanID > 4094 { vlanID = 0 From de81e4c4d133ac6c9450880b6b51be5d5031f271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Wed, 3 Apr 2024 22:32:49 -0400 Subject: [PATCH 2/2] doc/network/bridge: Update extended external_interfaces documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- doc/reference/network_bridge.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/reference/network_bridge.md b/doc/reference/network_bridge.md index e69c8894329..89a4f468da0 100644 --- a/doc/reference/network_bridge.md +++ b/doc/reference/network_bridge.md @@ -111,7 +111,9 @@ Key | Type | Condition | Defau `user.*` | string | - | - | User-provided free-form key/value pairs ```{note} -The `bridge.external_interfaces` option supports extended format for the external interfaces when using the `native` driver. The extended format is `//`. When the external interface is added to the list with the extended format, the system will automatically create the interface upon the network's creation and subsequently delete it when the network is terminated. The system verifies that the does not already exist. If the interface name is in use with a different parent or VLAN ID, or if the creation of the interface is unsuccessful, the system will revert with an error message. +The `bridge.external_interfaces` option supports an extended format allowing the creation of missing VLAN interfaces. +The extended format is `//`. +When the external interface is added to the list with the extended format, the system will automatically create the interface upon the network's creation and subsequently delete it when the network is terminated. The system verifies that the does not already exist. If the interface name is in use with a different parent or VLAN ID, or if the creation of the interface is unsuccessful, the system will revert with an error message. ``` (network-bridge-features)=