diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-06 18:17:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-06 18:17:55 +0200 |
| commit | b5618d9e354a565fb8e472208c835a36373e4fbb (patch) | |
| tree | f755f4b52de94c38b432f23127d302b3d8c0a1a4 /pkg/spec | |
| parent | 37b40e9acdae6bfa79d53928361540754417cdc6 (diff) | |
| parent | 97b84dedf3806a9e87c04ccfb51212992785d2c8 (diff) | |
| download | podman-b5618d9e354a565fb8e472208c835a36373e4fbb.tar.gz podman-b5618d9e354a565fb8e472208c835a36373e4fbb.tar.bz2 podman-b5618d9e354a565fb8e472208c835a36373e4fbb.zip | |
Merge pull request #3736 from baude/revert
Revert "rootless: Rearrange setup of rootless containers"
Diffstat (limited to 'pkg/spec')
| -rw-r--r-- | pkg/spec/createconfig.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/spec/createconfig.go b/pkg/spec/createconfig.go index 289634a0d..f21ae2831 100644 --- a/pkg/spec/createconfig.go +++ b/pkg/spec/createconfig.go @@ -270,7 +270,7 @@ func (c *CreateConfig) getContainerCreateOptions(runtime *libpod.Runtime, pod *l options = append(options, libpod.WithNetNSFrom(connectedCtr)) } else if !c.NetMode.IsHost() && !c.NetMode.IsNone() { hasUserns := c.UsernsMode.IsContainer() || c.UsernsMode.IsNS() || len(c.IDMappings.UIDMap) > 0 || len(c.IDMappings.GIDMap) > 0 - postConfigureNetNS := hasUserns && !c.UsernsMode.IsHost() + postConfigureNetNS := c.NetMode.IsSlirp4netns() || (hasUserns && !c.UsernsMode.IsHost()) options = append(options, libpod.WithNetNS(portBindings, postConfigureNetNS, string(c.NetMode), networks)) } |