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 --- libpod/runtime_pod_infra_linux.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libpod/runtime_pod_infra_linux.go') diff --git a/libpod/runtime_pod_infra_linux.go b/libpod/runtime_pod_infra_linux.go index 20b841296..da35b7f93 100644 --- a/libpod/runtime_pod_infra_linux.go +++ b/libpod/runtime_pod_infra_linux.go @@ -95,9 +95,7 @@ func (r *Runtime) makeInfraContainer(ctx context.Context, p *Pod, imgName, imgID if isRootless { netmode = "slirp4netns" } - // PostConfigureNetNS should not be set since user namespace sharing is not implemented - // and rootless networking no longer supports post configuration setup - options = append(options, WithNetNS(p.config.InfraContainer.PortBindings, false, netmode, networks)) + options = append(options, WithNetNS(p.config.InfraContainer.PortBindings, isRootless, netmode, networks)) return r.newContainer(ctx, g.Config, options...) } -- cgit v1.2.3-54-g00ecf