From 97b84dedf3806a9e87c04ccfb51212992785d2c8 Mon Sep 17 00:00:00 2001 From: baude Date: Tue, 6 Aug 2019 09:49:03 -0500 Subject: Revert "rootless: Rearrange setup of rootless containers" This reverts commit 80dcd4bebcdc8e280f6b43228561d09c194c328b. Signed-off-by: baude --- pkg/spec/createconfig.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/spec') 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)) } -- cgit v1.2.3-54-g00ecf