summaryrefslogtreecommitdiff
path: root/libpod/runtime_ctr.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2019-12-18 09:42:01 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2019-12-19 13:33:17 -0500
commit123b8c627d53c6bd76ff4d9f6a74674341a987c0 (patch)
treee6bdf872b1264da1001a24145c4165b4b96e6527 /libpod/runtime_ctr.go
parent6b956dfd1f1071ceb40b403a9604da387979105a (diff)
downloadpodman-123b8c627d53c6bd76ff4d9f6a74674341a987c0.tar.gz
podman-123b8c627d53c6bd76ff4d9f6a74674341a987c0.tar.bz2
podman-123b8c627d53c6bd76ff4d9f6a74674341a987c0.zip
if container is not in a pid namespace, stop all processes
When a container is in a PID namespace, it is enought to send the stop signal to the PID 1 of the namespace, only send signals to all processes in the container when the container is not in a pid namespace. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'libpod/runtime_ctr.go')
-rw-r--r--libpod/runtime_ctr.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go
index ae401013c..6a10849ab 100644
--- a/libpod/runtime_ctr.go
+++ b/libpod/runtime_ctr.go
@@ -463,7 +463,7 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool,
// Check that the container's in a good state to be removed
if c.state.State == define.ContainerStateRunning {
- if err := c.stop(c.StopTimeout(), true); err != nil {
+ if err := c.stop(c.StopTimeout()); err != nil {
return errors.Wrapf(err, "cannot remove container %s as it could not be stopped", c.ID())
}
}