diff options
| author | baude <bbaude@redhat.com> | 2019-08-06 09:49:03 -0500 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2019-08-06 09:51:38 -0500 |
| commit | 97b84dedf3806a9e87c04ccfb51212992785d2c8 (patch) | |
| tree | d3046e11b435900e041003c21b0e1e78383c8598 /libpod/oci_linux.go | |
| parent | 3bffe77f824772b841080ea463324f5ae5c833d4 (diff) | |
| download | podman-97b84dedf3806a9e87c04ccfb51212992785d2c8.tar.gz podman-97b84dedf3806a9e87c04ccfb51212992785d2c8.tar.bz2 podman-97b84dedf3806a9e87c04ccfb51212992785d2c8.zip | |
Revert "rootless: Rearrange setup of rootless containers"
This reverts commit 80dcd4bebcdc8e280f6b43228561d09c194c328b.
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'libpod/oci_linux.go')
| -rw-r--r-- | libpod/oci_linux.go | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libpod/oci_linux.go b/libpod/oci_linux.go index 4d8e36516..45365203e 100644 --- a/libpod/oci_linux.go +++ b/libpod/oci_linux.go @@ -405,14 +405,6 @@ func (r *OCIRuntime) stopContainer(ctr *Container, timeout uint) error { stopSignal = uint(syscall.SIGTERM) } - defer func() { - // cleanup container networking - err = ctr.cleanupNetwork() - if err != nil { - logrus.Errorf("Error cleaning up container: %s network: %v", ctr.ID(), err) - } - }() - if timeout > 0 { if err := r.killContainer(ctr, stopSignal); err != nil { // Is the container gone? |