Merge pull request #1283 from stgraber/main

Various bugfixes
lxc · Oct 3, 2024 · adee036 · adee036
2 parents f0f04d7 + b8aa460
commit adee036
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/doc/reference/devices_proxy.md b/doc/reference/devices_proxy.md
@@ -26,7 +26,7 @@ The supported connection types are:
 
 To add a `proxy` device, use the following command:
 
-    incus config device add <instance_name> <device_name> proxy listen=<type>:<addr>:<port>[-<port>][,<port>] connect=<type>:<addr>:<port> bind=<host/instance_name>
+    incus config device add <instance_name> <device_name> proxy listen=<type>:<addr>:<port>[-<port>][,<port>] connect=<type>:<addr>:<port> bind=<host/instance>
 
 (devices-proxy-nat-mode)=
 ## NAT mode

diff --git a/internal/server/network/driver_bridge.go b/internal/server/network/driver_bridge.go
@@ -785,6 +785,13 @@ func (n *bridge) setup(oldConfig map[string]string) error {
 			if err != nil {
 				return err
 			}
+
+			// Make sure the port is up.
+			link := &ip.Link{Name: entry}
+			err = link.SetUp()
+			if err != nil {
+				return fmt.Errorf("Failed to bring up the host interface %s: %w", entry, err)
+			}
 		}
 	}