summaryrefslogtreecommitdiff
path: root/pkg/specgen
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-01-21 09:57:26 -0500
committerGitHub <noreply@github.com>2022-01-21 09:57:26 -0500
commit6e171585027e5dfcf519cf4bdc9a281248cfe0c3 (patch)
tree4ee46dc4ce4029329629c6015700aa8cf1a62b02 /pkg/specgen
parent02d8520869a1ec23e1a7bc77cc8b90e3bca2cc03 (diff)
parentee039b7403b55b1d4f85b5527a8caee09fa30844 (diff)
downloadpodman-6e171585027e5dfcf519cf4bdc9a281248cfe0c3.tar.gz
podman-6e171585027e5dfcf519cf4bdc9a281248cfe0c3.tar.bz2
podman-6e171585027e5dfcf519cf4bdc9a281248cfe0c3.zip
Merge pull request #12948 from Luap99/rootless-networking
Remove rootless_networking option from containers.conf
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