aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-09-20 14:21:44 -0400
committerGitHub <noreply@github.com>2021-09-20 14:21:44 -0400
commit791458605af79e17e12a5a56fff30742ea0ff310 (patch)
treeeb056166911b641c6c230023cb7cbf19697fa3eb /docs
parentfff178fe517406f61fc6ddad00312ee7282e0174 (diff)
parentb74edfb0a1bf5a27a3bba884a0e2275d2f281a65 (diff)
downloadpodman-791458605af79e17e12a5a56fff30742ea0ff310.tar.gz
podman-791458605af79e17e12a5a56fff30742ea0ff310.tar.bz2
podman-791458605af79e17e12a5a56fff30742ea0ff310.zip
Merge pull request #11630 from rhatdan/timeout
Add support for retrieving system service --timeout
Diffstat (limited to 'docs')
-rw-r--r--docs/source/markdown/podman-system-service.1.md5
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/source/markdown/podman-system-service.1.md b/docs/source/markdown/podman-system-service.1.md
index dfb026de1..3bc4fc7f1 100644
--- a/docs/source/markdown/podman-system-service.1.md
+++ b/docs/source/markdown/podman-system-service.1.md
@@ -30,6 +30,9 @@ Note: The default systemd unit files (system and user) change the log-level opti
The time until the session expires in _seconds_. The default is 5
seconds. A value of `0` means no timeout, therefore the session will not expire.
+The default timeout can be changed via the `service_timeout=VALUE` field in containers.conf.
+See **[containers.conf(5)](https://github.com/containers/common/blob/master/docs/containers.conf.5.md)** for more information.
+
#### **--cors**
CORS headers to inject to the HTTP response. The default value is empty string which disables CORS headers.
@@ -46,7 +49,7 @@ podman system service --time 5
```
## SEE ALSO
-podman(1), podman-system-service(1), podman-system-connection(1)
+**[podman(1)](podman.1.md)**, **[podman-system-connection(1)](podman-system-connection.1.md)**, **[containers.conf(5)](https://github.com/containers/common/blob/master/docs/containers.conf.5.md)**
## HISTORY
January 2020, Originally compiled by Brent Baude `<bbaude@redhat.com>`