diff options
| author | Valentin Rothberg <vrothberg@redhat.com> | 2022-09-14 14:10:19 +0200 |
|---|---|---|
| committer | Valentin Rothberg <vrothberg@redhat.com> | 2022-09-15 13:15:35 +0200 |
| commit | c20abf12c714f359c7bbb291c444530f70cb1185 (patch) | |
| tree | f92a0a6f43af9360a415e04957870148b4b628e2 /test/e2e | |
| parent | 2a8df49c2a65831fa2c253afa1ad2b5e1d618b09 (diff) | |
| download | podman-c20abf12c714f359c7bbb291c444530f70cb1185.tar.gz podman-c20abf12c714f359c7bbb291c444530f70cb1185.tar.bz2 podman-c20abf12c714f359c7bbb291c444530f70cb1185.zip | |
generate systemd: drop ExecStop
Drop the ExecStop step to simplify the generated units a bit.
The extra ExecStopPost step was added by commit e5c343294424. If the
main PID (i.e., conmon) is killed, systemd will not execute ExecStop
(since the main PID is already down) but only execute the *Post steps.
Credits to the late Ulrich Obergfell for tracking this issue down; he is
missed.
The ExecStop step can safely be dropped since the Post step will take of
stopping (and removing) in any case.
Context: #15686
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/generate_systemd_test.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go index 347440faf..7ceea1b91 100644 --- a/test/e2e/generate_systemd_test.go +++ b/test/e2e/generate_systemd_test.go @@ -566,7 +566,6 @@ var _ = Describe("Podman generate systemd", func() { Expect(session.OutputToString()).To(ContainSubstring("BindsTo=pod-foo.service")) Expect(session.OutputToString()).To(ContainSubstring("pod create --infra-conmon-pidfile %t/pod-foo.pid --pod-id-file %t/pod-foo.pod-id --exit-policy=stop --name foo")) Expect(session.OutputToString()).To(ContainSubstring("ExecStartPre=/bin/rm -f %t/pod-foo.pid %t/pod-foo.pod-id")) - Expect(session.OutputToString()).To(ContainSubstring("pod stop --ignore --pod-id-file %t/pod-foo.pod-id -t 10")) Expect(session.OutputToString()).To(ContainSubstring("pod rm --ignore -f --pod-id-file %t/pod-foo.pod-id")) }) |