summaryrefslogtreecommitdiff
path: root/cmd/podman
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 /cmd/podman
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 'cmd/podman')
-rw-r--r--cmd/podman/system/service.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go
index a30f43839..d6fe8837b 100644
--- a/cmd/podman/system/service.go
+++ b/cmd/podman/system/service.go
@@ -52,8 +52,9 @@ func init() {
flags := srvCmd.Flags()
+ cfg := registry.PodmanConfig()
timeFlagName := "time"
- flags.Int64VarP(&srvArgs.Timeout, timeFlagName, "t", 5, "Time until the service session expires in seconds. Use 0 to disable the timeout")
+ flags.Int64VarP(&srvArgs.Timeout, timeFlagName, "t", int64(cfg.Engine.ServiceTimeout), "Time until the service session expires in seconds. Use 0 to disable the timeout")
_ = srvCmd.RegisterFlagCompletionFunc(timeFlagName, completion.AutocompleteNone)
flags.StringVarP(&srvArgs.CorsHeaders, "cors", "", "", "Set CORS Headers")
_ = srvCmd.RegisterFlagCompletionFunc("cors", completion.AutocompleteNone)