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 /libpod/runtime_pod_infra_linux.go | |
| 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 '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...) } |