diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2021-08-24 13:33:00 +0200 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2021-08-24 13:33:06 +0200 |
| commit | 74ab2aaf9f27e1495a74c37932a634c82af9a57b (patch) | |
| tree | 8b9f83168bfcdac85572b2ea49dc711547a5aa85 /pkg/systemd/generate/common.go | |
| parent | e20ec47a59b4ac65d42f3fee7b8b7ec5760ea35d (diff) | |
| download | podman-74ab2aaf9f27e1495a74c37932a634c82af9a57b.tar.gz podman-74ab2aaf9f27e1495a74c37932a634c82af9a57b.tar.bz2 podman-74ab2aaf9f27e1495a74c37932a634c82af9a57b.zip | |
Revert "generate systemd: custom stop signal"
This reverts commit 70801b3d714b067d64744697433c5841926dad4d.
It turns out that letting systemd handle stopping the container is not
working as I thought it will. Conmon is receiving the stop/kill signals
and may exit non-zero, which in turn lets the systemd service transition
into the `failed` state.
We need to get back to letting Podman stop the containers and do a
partial revert of commit 9ac5267 which removed using --cidfile.
Happening in a following commit.
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'pkg/systemd/generate/common.go')
| -rw-r--r-- | pkg/systemd/generate/common.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/systemd/generate/common.go b/pkg/systemd/generate/common.go index f2092c0ae..45e12014a 100644 --- a/pkg/systemd/generate/common.go +++ b/pkg/systemd/generate/common.go @@ -8,9 +8,9 @@ import ( "github.com/pkg/errors" ) -// minTimeoutStopSec is the minimal stop timeout for generated systemd units -// without --new. Once exceeded, processes of the services are killed and the -// cgroup(s) are cleaned up. +// minTimeoutStopSec is the minimal stop timeout for generated systemd units. +// Once exceeded, processes of the services are killed and the cgroup(s) are +// cleaned up. const minTimeoutStopSec = 60 // validateRestartPolicy checks that the user-provided policy is valid. |