diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-20 12:13:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-20 12:13:22 +0100 |
commit | e33d7e9fab9974c8c13868e7434f78feab7508af (patch) | |
tree | 8eb093ebf09aed38f569534517e395c9439bec67 /libpod/pod_api.go | |
parent | 1ba6d0f883e17f2d460773f929873563b753d3e6 (diff) | |
parent | 123b8c627d53c6bd76ff4d9f6a74674341a987c0 (diff) | |
download | podman-e33d7e9fab9974c8c13868e7434f78feab7508af.tar.gz podman-e33d7e9fab9974c8c13868e7434f78feab7508af.tar.bz2 podman-e33d7e9fab9974c8c13868e7434f78feab7508af.zip |
Merge pull request #4727 from rhatdan/pidns
if container is not in a pid namespace, stop all processes
Diffstat (limited to 'libpod/pod_api.go')
-rw-r--r-- | libpod/pod_api.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/pod_api.go b/libpod/pod_api.go index b27257004..cb04f7411 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -123,7 +123,7 @@ func (p *Pod) StopWithTimeout(ctx context.Context, cleanup bool, timeout int) (m if timeout > -1 { stopTimeout = uint(timeout) } - if err := ctr.stop(stopTimeout, false); err != nil { + if err := ctr.stop(stopTimeout); err != nil { ctr.lock.Unlock() ctrErrors[ctr.ID()] = err continue |