Merge pull request #12948 from Luap99/rootless-networking

Remove rootless_networking option from containers.conf

pkg/machine/ignition.go

@@ -243,7 +243,6 @@ ExecStart=/usr/bin/sleep infinity
 `
 	containers := `[containers]
 netns="bridge"
-rootless_networking="cni"
 `
 	rootContainers := `[engine]
 machine_enabled=true

pkg/specgen/namespaces.go

@@ -353,11 +353,11 @@ func ParseNetworkFlag(networks []string) (Namespace, map[string]types.PerNetwork
 		toReturn.NSMode = FromPod
 	case ns == "" || ns == string(Default) || ns == string(Private):
 		// Net defaults to Slirp on rootless
-		if rootless.IsRootless() && containerConfig.Containers.RootlessNetworking != "cni" {
+		if rootless.IsRootless() {
 			toReturn.NSMode = Slirp
 			break
 		}
-		// if not slirp we use bridge
+		// if root we use bridge
 		fallthrough
 	case ns == string(Bridge), strings.HasPrefix(ns, string(Bridge)+":"):
 		toReturn.NSMode = Bridge