summaryrefslogtreecommitdiff
path: root/pkg/spec/createconfig.go
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2019-08-06 09:49:03 -0500
committerbaude <bbaude@redhat.com>2019-08-06 09:51:38 -0500
commit97b84dedf3806a9e87c04ccfb51212992785d2c8 (patch)
treed3046e11b435900e041003c21b0e1e78383c8598 /pkg/spec/createconfig.go
parent3bffe77f824772b841080ea463324f5ae5c833d4 (diff)
downloadpodman-97b84dedf3806a9e87c04ccfb51212992785d2c8.tar.gz
podman-97b84dedf3806a9e87c04ccfb51212992785d2c8.tar.bz2
podman-97b84dedf3806a9e87c04ccfb51212992785d2c8.zip
Revert "rootless: Rearrange setup of rootless containers"
This reverts commit 80dcd4bebcdc8e280f6b43228561d09c194c328b. Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/spec/createconfig.go')
-rw-r--r--pkg/spec/createconfig.go2
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))
}