diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-23 11:25:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-23 11:25:41 +0100 |
| commit | 90c635fd675bf9378e0ee0cbc7b95229bf9653e4 (patch) | |
| tree | 284aa5a3bf10350bf47bacc41f124fcad55c33e8 /pkg/systemd/generate/pods.go | |
| parent | a55473bea80c2d9e5d79ac97a2bfe313622033f9 (diff) | |
| parent | 566b78dd02e91f376e9f219cb96ddba153671eb5 (diff) | |
| download | podman-90c635fd675bf9378e0ee0cbc7b95229bf9653e4.tar.gz podman-90c635fd675bf9378e0ee0cbc7b95229bf9653e4.tar.bz2 podman-90c635fd675bf9378e0ee0cbc7b95229bf9653e4.zip | |
Merge pull request #12380 from vrothberg/fix-11618
generate systemd: add --start-timeout flag
Diffstat (limited to 'pkg/systemd/generate/pods.go')
| -rw-r--r-- | pkg/systemd/generate/pods.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/systemd/generate/pods.go b/pkg/systemd/generate/pods.go index 38f7e8e3e..f4cc31c8e 100644 --- a/pkg/systemd/generate/pods.go +++ b/pkg/systemd/generate/pods.go @@ -195,9 +195,9 @@ func generatePodInfo(pod *libpod.Pod, options entities.GenerateSystemdOptions) ( return nil, errors.Wrap(err, "could not find infra container") } - timeout := infraCtr.StopTimeout() + stopTimeout := infraCtr.StopTimeout() if options.StopTimeout != nil { - timeout = *options.StopTimeout + stopTimeout = *options.StopTimeout } config := infraCtr.Config() @@ -223,7 +223,7 @@ func generatePodInfo(pod *libpod.Pod, options entities.GenerateSystemdOptions) ( ServiceName: serviceName, InfraNameOrID: ctrNameOrID, PIDFile: conmonPidFile, - StopTimeout: timeout, + StopTimeout: stopTimeout, GenerateTimestamp: true, CreateCommand: createCommand, } |