opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 00:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6568 from giuseppe/fix-check-for-rootless-net

Browse Source 
libpod: fix check for slirp4netns netns
This commit is contained in:
OpenShift Merge Robot
2020-06-11 08:55:50 -04:00
committed by GitHub
parent b62e50f53b 8ef1b461ae
commit 1060a94efb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libpod/container_internal_linux.go
View File

@ -79,7 +79,8 @@ func (c *Container) prepare() error {
go func() { go func() {
defer wg.Done() defer wg.Done()
// Set up network namespace if not already set up // Set up network namespace if not already set up
if c.config.CreateNetNS && c.state.NetNS == nil && !c.config.PostConfigureNetNS { noNetNS := c.state.NetNS == nil
if c.config.CreateNetNS && noNetNS && !c.config.PostConfigureNetNS {
netNS, networkStatus, createNetNSErr = c.runtime.createNetNS(c) netNS, networkStatus, createNetNSErr = c.runtime.createNetNS(c)
if createNetNSErr != nil { if createNetNSErr != nil {
return return
@ -94,7 +95,7 @@ func (c *Container) prepare() error {
} }
// handle rootless network namespace setup // handle rootless network namespace setup
if c.state.NetNS != nil && c.config.NetMode.IsSlirp4netns() && !c.config.PostConfigureNetNS { if noNetNS && c.config.NetMode.IsSlirp4netns() && !c.config.PostConfigureNetNS {
createNetNSErr = c.runtime.setupRootlessNetNS(c) createNetNSErr = c.runtime.setupRootlessNetNS(c)
} }
}() }()