mirror of
https://github.com/containers/podman.git
synced 2025-05-18 07:36:21 +08:00
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>
This commit is contained in:
@ -243,7 +243,6 @@ ExecStart=/usr/bin/sleep infinity
|
||||
`
|
||||
containers := `[containers]
|
||||
netns="bridge"
|
||||
rootless_networking="cni"
|
||||
`
|
||||
rootContainers := `[engine]
|
||||
machine_enabled=true
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user