summaryrefslogtreecommitdiff
path: root/pkg/specgen
diff options
context:
space:
mode:
authorPaul Holzinger <pholzing@redhat.com>2022-01-20 18:52:36 +0100
committerPaul Holzinger <pholzing@redhat.com>2022-01-20 19:08:15 +0100
commitee039b7403b55b1d4f85b5527a8caee09fa30844 (patch)
tree1da010a6254a43d7eca109676cfbb90fd7b2ce5c /pkg/specgen
parent206e57e5b012ae03315dfb84735d034dd9cfd26e (diff)
downloadpodman-ee039b7403b55b1d4f85b5527a8caee09fa30844.tar.gz
podman-ee039b7403b55b1d4f85b5527a8caee09fa30844.tar.bz2
podman-ee039b7403b55b1d4f85b5527a8caee09fa30844.zip
Remove rootless_networking option from containers.conf
This field was only needed for machine to force cni, however you can set netns="bridge" in the config to have the same effect. This is already done in the machine setup. see https://github.com/containers/common/pull/895 [NO NEW TESTS NEEDED] Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'pkg/specgen')
-rw-r--r--pkg/specgen/namespaces.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/specgen/namespaces.go b/pkg/specgen/namespaces.go
index 1634b86b5..f61937078 100644
--- a/pkg/specgen/namespaces.go
+++ b/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