diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-09 21:11:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-09 21:11:30 +0100 |
| commit | 5437568fcda04c2999b5fa9aad4dd07f2d3cfd67 (patch) | |
| tree | 2d5d9ccac8fc5c3c3e71fd5984a0cbe6adae87ba /libpod/container_internal_linux.go | |
| parent | 43bd57c7fb16ff7a6531c260ff3f9838bd20b4aa (diff) | |
| parent | 216e2cb36679abfcca869bed110b73e816ff9bf4 (diff) | |
| download | podman-5437568fcda04c2999b5fa9aad4dd07f2d3cfd67.tar.gz podman-5437568fcda04c2999b5fa9aad4dd07f2d3cfd67.tar.bz2 podman-5437568fcda04c2999b5fa9aad4dd07f2d3cfd67.zip | |
Merge pull request #12227 from Luap99/net-setup
Fix rootless networking with userns and ports
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 3187724ca..91453574e 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -108,15 +108,6 @@ func (c *Container) prepare() error { c.state.NetNS = netNS c.state.NetworkStatus = networkStatus } - - // handle rootless network namespace setup - if noNetNS && !c.config.PostConfigureNetNS { - if rootless.IsRootless() { - createNetNSErr = c.runtime.setupRootlessNetNS(c) - } else if c.config.NetMode.IsSlirp4netns() { - createNetNSErr = c.runtime.setupSlirp4netns(c) - } - } }() // Mount storage if not mounted go func() { |