incus: improve defaults

cmd/start.go

@@ -336,6 +336,15 @@ func setFlagDefaults(cmd *cobra.Command) {
 			}
 		}
 	}
+
+	// always enable network address for incus, if supported and not explicitly disabled
+	if util.MacOS13OrNewer() {
+		if !cmd.Flag("network-address").Changed {
+			if startCmdArgs.Runtime == incus.Name && startCmdArgs.VMType == "vz" {
+				startCmdArgs.Network.Address = true
+			}
+		}
+	}
 }
 
 func setConfigDefaults(conf *config.Config) {

environment/container/incus/incus.go

@@ -190,13 +190,6 @@ func (c *incusRuntime) Start(ctx context.Context) error {
 		return nil
 	})
 
-	a.Add(func() error {
-		if err := c.registerNetworks(); err != nil {
-			return cli.ErrNonFatal(err)
-		}
-		return nil
-	})
-
 	a.Add(func() error {
 		if err := c.addContainerRoute(); err != nil {
 			return cli.ErrNonFatal(err)
@@ -321,27 +314,6 @@ func (c incusRuntime) addDockerRemote() error {
 	return c.host.RunQuiet("incus", "remote", "add", "docker", "https://docker.io", "--protocol=oci")
 }
 
-func (c incusRuntime) registerNetworks() error {
-	name := limautil.NetInterface
-
-	found, network, err := c.findNetwork(name)
-	if err != nil {
-		return err
-	}
-
-	// must be an unmanaged physical network
-	if !found || network.Managed || network.Type != "physical" {
-		return nil
-	}
-
-	err = c.guest.RunQuiet("sudo", "incus", "network", "create", name, "--type", "macvlan", "parent="+name)
-	if err != nil {
-		return fmt.Errorf("error creating managed network '%s': %w", name, err)
-	}
-
-	return nil
-}
-
 func (c incusRuntime) findNetwork(interfaceName string) (found bool, info networkInfo, err error) {
 	b, err := c.guest.RunOutput("sudo", "incus", "network", "list", "--format", "json")
 	if err != nil {

environment/container/incus/route.go

@@ -45,7 +45,6 @@ func (c *incusRuntime) addContainerRoute() error {
 }
 
 // removeContainerRoute removes the macOS route for the Incus container subnet.
-// This is best-effort and errors are silently ignored.
 func (c *incusRuntime) removeContainerRoute() error {
 	if !util.MacOS() {
 		return nil

util/macos.go

@@ -31,7 +31,7 @@ func MacOS15OrNewer() bool { return minMacOSVersion("15.0.0") }
 
 // MacOSNestedVirtualizationSupported returns if the current device supports nested virtualization.
 func MacOSNestedVirtualizationSupported() bool {
-	return (IsMx(3) || IsMx(4)) && MacOS15OrNewer()
+	return (IsMx(3) || IsMx(4) || IsMx(5)) && MacOS15OrNewer()
 }
 
 func minMacOSVersion(version string) bool {