diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-08-24 06:13:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-24 06:13:56 -0400 |
| commit | e20ec47a59b4ac65d42f3fee7b8b7ec5760ea35d (patch) | |
| tree | 7c32b2fb385ddc6a7296edd6609f9526d8df20c3 /pkg/systemd/generate/pods.go | |
| parent | eb9d731c68266cd0953b0669f2bc6340aa8df288 (diff) | |
| parent | 70801b3d714b067d64744697433c5841926dad4d (diff) | |
| download | podman-e20ec47a59b4ac65d42f3fee7b8b7ec5760ea35d.tar.gz podman-e20ec47a59b4ac65d42f3fee7b8b7ec5760ea35d.tar.bz2 podman-e20ec47a59b4ac65d42f3fee7b8b7ec5760ea35d.zip | |
Merge pull request #11312 from vrothberg/fix-11304
generate systemd: custom stop signal
Diffstat (limited to 'pkg/systemd/generate/pods.go')
| -rw-r--r-- | pkg/systemd/generate/pods.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/systemd/generate/pods.go b/pkg/systemd/generate/pods.go index 1b92649e8..d49828884 100644 --- a/pkg/systemd/generate/pods.go +++ b/pkg/systemd/generate/pods.go @@ -323,7 +323,7 @@ func executePodTemplate(info *podInfo, options entities.GenerateSystemdOptions) info.ExecStop = "{{{{.Executable}}}} {{{{if .RootFlags}}}}{{{{ .RootFlags}}}} {{{{end}}}}pod stop --ignore --pod-id-file {{{{.PodIDFile}}}} {{{{if (ge .StopTimeout 0)}}}}-t {{{{.StopTimeout}}}}{{{{end}}}}" info.ExecStopPost = "{{{{.Executable}}}} {{{{if .RootFlags}}}}{{{{ .RootFlags}}}} {{{{end}}}}pod rm --ignore -f --pod-id-file {{{{.PodIDFile}}}}" } - info.TimeoutStopSec = minTimeoutStopSec + info.StopTimeout + info.TimeoutStopSec = info.StopTimeout if info.PodmanVersion == "" { info.PodmanVersion = version.Version.String() |