diff options
| author | Paul Holzinger <paul.holzinger@web.de> | 2021-02-18 14:53:53 +0100 |
|---|---|---|
| committer | Paul Holzinger <paul.holzinger@web.de> | 2021-04-01 17:27:03 +0200 |
| commit | 00b2ec5e6f8ad332411271df1bdd968493cab2c2 (patch) | |
| tree | 69485fd451bdb144ce8914af23a746639b21a745 /libpod/container_internal.go | |
| parent | 54b588c07d05858c9bbc523eeff0badb85d53f76 (diff) | |
| download | podman-00b2ec5e6f8ad332411271df1bdd968493cab2c2.tar.gz podman-00b2ec5e6f8ad332411271df1bdd968493cab2c2.tar.bz2 podman-00b2ec5e6f8ad332411271df1bdd968493cab2c2.zip | |
Add rootless support for cni and --uidmap
This is supported with the new rootless cni logic.
Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
Diffstat (limited to 'libpod/container_internal.go')
| -rw-r--r-- | libpod/container_internal.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 106e2569b..a53027ab2 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -966,9 +966,7 @@ func (c *Container) completeNetworkSetup() error { if err := c.syncContainer(); err != nil { return err } - if rootless.IsRootless() { - return c.runtime.setupRootlessNetNS(c) - } else if c.config.NetMode.IsSlirp4netns() { + if c.config.NetMode.IsSlirp4netns() { return c.runtime.setupSlirp4netns(c) } if err := c.runtime.setupNetNS(c); err != nil { |