diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-17 04:44:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-17 04:44:49 -0400 |
| commit | d86bae2a01cb855d5964a2a3fbdd41afe68d62c8 (patch) | |
| tree | b69b21c84a341626823eee106730134166e10b96 /pkg/namespaces/namespaces.go | |
| parent | 0bd51819428e402599f681f273947c805f4641cf (diff) | |
| parent | d35d8125bf0be2add82003de1a4b89a0594bb9a0 (diff) | |
| download | podman-d86bae2a01cb855d5964a2a3fbdd41afe68d62c8.tar.gz podman-d86bae2a01cb855d5964a2a3fbdd41afe68d62c8.tar.bz2 podman-d86bae2a01cb855d5964a2a3fbdd41afe68d62c8.zip | |
Merge pull request #6965 from giuseppe/followup-pr6324
allow switching of port-forward approaches in rootless/using slirp4netns
Diffstat (limited to 'pkg/namespaces/namespaces.go')
| -rw-r--r-- | pkg/namespaces/namespaces.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/namespaces/namespaces.go b/pkg/namespaces/namespaces.go index 2ffbde977..7831af8f9 100644 --- a/pkg/namespaces/namespaces.go +++ b/pkg/namespaces/namespaces.go @@ -385,7 +385,7 @@ func (n NetworkMode) IsBridge() bool { // IsSlirp4netns indicates if we are running a rootless network stack func (n NetworkMode) IsSlirp4netns() bool { - return n == slirpType + return n == slirpType || strings.HasPrefix(string(n), slirpType+":") } // IsNS indicates a network namespace passed in by path (ns:<path>) |