diff options
| author | baude <bbaude@redhat.com> | 2019-08-06 09:49:03 -0500 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2019-08-06 09:51:38 -0500 |
| commit | 97b84dedf3806a9e87c04ccfb51212992785d2c8 (patch) | |
| tree | d3046e11b435900e041003c21b0e1e78383c8598 /libpod/runtime_pod_infra_linux.go | |
| parent | 3bffe77f824772b841080ea463324f5ae5c833d4 (diff) | |
| download | podman-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 'libpod/runtime_pod_infra_linux.go')
| -rw-r--r-- | libpod/runtime_pod_infra_linux.go | 4 |
1 files changed, 1 insertions, 3 deletions
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...) } |