diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-03-27 16:26:36 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-03-31 08:50:32 -0400 |
| commit | 3449b27cd1743a1353ea8c4503eec5d126d04b0d (patch) | |
| tree | b4c65b7cbbc1307e6a4c021531f4b7a1e53b4c8d /docs/source/markdown/podman-generate-systemd.1.md | |
| parent | 9c7410d331ed6c9af50babb41314bfa67a3f39e0 (diff) | |
| download | podman-3449b27cd1743a1353ea8c4503eec5d126d04b0d.tar.gz podman-3449b27cd1743a1353ea8c4503eec5d126d04b0d.tar.bz2 podman-3449b27cd1743a1353ea8c4503eec5d126d04b0d.zip | |
Switch to using --time as opposed to --timeout to better match Docker.
We need to consistently use --time rather then --timeout throughout the code.
Fix locations where timeout defaults are not set correctly as well.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'docs/source/markdown/podman-generate-systemd.1.md')
| -rw-r--r-- | docs/source/markdown/podman-generate-systemd.1.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/source/markdown/podman-generate-systemd.1.md b/docs/source/markdown/podman-generate-systemd.1.md index 27b40bbb6..57ed9a5eb 100644 --- a/docs/source/markdown/podman-generate-systemd.1.md +++ b/docs/source/markdown/podman-generate-systemd.1.md @@ -27,7 +27,7 @@ Use the name of the container for the start, stop, and description in the unit f Create a new container via podman-run instead of starting an existing one. This option relies on container configuration files, which may not map directly to podman CLI flags; please review the generated output carefully before placing in production. Since we use systemd `Type=forking` service, using this option will force the container run with the detached param `-d` -**--timeout**, **-t**=*value* +**--time**, **-t**=*value* Override the default stop timeout for the container with the given value. |