diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-05 18:59:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-05 18:59:55 +0100 |
| commit | e826158b4b9c4baef41ca872dea5e68e089355d3 (patch) | |
| tree | 3fff45f85073bfda41adccf6e45a0ffd5fc44b91 /pkg/domain/infra/abi/system.go | |
| parent | 9b3b44903d4d494186bd767d2ea5f3b2c753a7f2 (diff) | |
| parent | 7f433df7e76716f801c959cad82f4add397d925a (diff) | |
| download | podman-e826158b4b9c4baef41ca872dea5e68e089355d3.tar.gz podman-e826158b4b9c4baef41ca872dea5e68e089355d3.tar.bz2 podman-e826158b4b9c4baef41ca872dea5e68e089355d3.zip | |
Merge pull request #12183 from Luap99/rootless-netns-cleanup
Fix rootless cni netns cleanup logic and rename to rootless netns
Diffstat (limited to 'pkg/domain/infra/abi/system.go')
| -rw-r--r-- | pkg/domain/infra/abi/system.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go index e326f26a8..7da7754f2 100644 --- a/pkg/domain/infra/abi/system.go +++ b/pkg/domain/infra/abi/system.go @@ -360,15 +360,15 @@ func (ic *ContainerEngine) Unshare(ctx context.Context, args []string, options e return cmd.Run() } - if options.RootlessCNI { - rootlesscni, err := ic.Libpod.GetRootlessCNINetNs(true) + if options.RootlessNetNS { + rootlessNetNS, err := ic.Libpod.GetRootlessNetNs(true) if err != nil { return err } // make sure to unlock, unshare can run for a long time - rootlesscni.Lock.Unlock() - defer rootlesscni.Cleanup(ic.Libpod) - return rootlesscni.Do(unshare) + rootlessNetNS.Lock.Unlock() + defer rootlessNetNS.Cleanup(ic.Libpod) + return rootlessNetNS.Do(unshare) } return unshare() } |