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 /libpod/container_internal.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 'libpod/container_internal.go')
| -rw-r--r-- | libpod/container_internal.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 051e0aeb7..e44ec76ec 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -586,7 +586,7 @@ func (c *Container) completeNetworkSetup() error { if err := c.syncContainer(); err != nil { return err } - if rootless.IsRootless() { + if c.config.NetMode == "slirp4netns" { return c.runtime.setupRootlessNetNS(c) } return c.runtime.setupNetNS(c) |