diff options
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index d06c19b8c..047b73d65 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -63,12 +63,12 @@ func (c *Container) unmountSHM(mount string) error { // namespaces func (c *Container) prepare() (err error) { var ( - wg sync.WaitGroup - netNS ns.NetNS - networkStatus []*cnitypes.Result - createNetNSErr, mountStorageErr, rootlessSetupErr error - mountPoint string - tmpStateLock sync.Mutex + wg sync.WaitGroup + netNS ns.NetNS + networkStatus []*cnitypes.Result + createNetNSErr, mountStorageErr error + mountPoint string + tmpStateLock sync.Mutex ) wg.Add(2) @@ -87,11 +87,6 @@ func (c *Container) prepare() (err error) { c.state.NetNS = netNS c.state.NetworkStatus = networkStatus } - - // Setup rootless networking, requires c.state.NetNS to be set - if rootless.IsRootless() { - rootlessSetupErr = c.runtime.setupRootlessNetNS(c) - } } }() // Mount storage if not mounted @@ -137,10 +132,6 @@ func (c *Container) prepare() (err error) { return mountStorageErr } - if rootlessSetupErr != nil { - return rootlessSetupErr - } - // Save the container return c.save() } |