diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-11-28 06:18:28 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 06:18:28 -0800 |
| commit | d346996e1512ef6efb3800d6cb762d0409d12459 (patch) | |
| tree | a5f9496bffe3df5a46627f56c0fee08aafdfee55 /pkg/spec/spec.go | |
| parent | 2a496aea30da4bbe4981753c11ed095867202466 (diff) | |
| parent | 95f22a2ca055d6dec0281cee109375dc4fd9b78b (diff) | |
| download | podman-d346996e1512ef6efb3800d6cb762d0409d12459.tar.gz podman-d346996e1512ef6efb3800d6cb762d0409d12459.tar.bz2 podman-d346996e1512ef6efb3800d6cb762d0409d12459.zip | |
Merge pull request #1849 from giuseppe/report-rootless-netmode
rootless: add new netmode "slirp4netns"
Diffstat (limited to 'pkg/spec/spec.go')
| -rw-r--r-- | pkg/spec/spec.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go index b1cca2c9e..05be00864 100644 --- a/pkg/spec/spec.go +++ b/pkg/spec/spec.go @@ -453,6 +453,9 @@ func addNetNS(config *CreateConfig, g *generate.Generator) error { } else if IsPod(string(netMode)) { logrus.Debug("Using pod netmode, unless pod is not sharing") return nil + } else if netMode.IsSlirp4netns() { + logrus.Debug("Using slirp4netns netmode") + return nil } else if netMode.IsUserDefined() { logrus.Debug("Using user defined netmode") return nil |