diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-18 19:27:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-18 19:27:30 -0500 |
| commit | 7e286bc430ea50b72e972e48626298ac2e1f258a (patch) | |
| tree | 18520dac08ce1401bd183b976f5b01141810e3ae /libpod/networking_linux.go | |
| parent | 797f1ea8cd0b7f4f85df4cf069bcd64c37a8ed1d (diff) | |
| parent | 24cc53cb5fa756a27a24b063b9372b8f8fd4348b (diff) | |
| download | podman-7e286bc430ea50b72e972e48626298ac2e1f258a.tar.gz podman-7e286bc430ea50b72e972e48626298ac2e1f258a.tar.bz2 podman-7e286bc430ea50b72e972e48626298ac2e1f258a.zip | |
Merge pull request #9427 from mheon/bump_301
Bump to v3.0.1
Diffstat (limited to 'libpod/networking_linux.go')
| -rw-r--r-- | libpod/networking_linux.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index 9edea4fea..03edf7f02 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -480,9 +480,8 @@ func (r *Runtime) setupSlirp4netns(ctr *Container) error { if havePortMapping { if isSlirpHostForward { return r.setupRootlessPortMappingViaSlirp(ctr, cmd, apiSocket) - } else { - return r.setupRootlessPortMappingViaRLK(ctr, netnsPath) } + return r.setupRootlessPortMappingViaRLK(ctr, netnsPath) } return nil } |