diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-21 05:21:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 05:21:09 -0400 |
| commit | 47d99fb6253238e7603fc96d5b9bbb14f1e8c948 (patch) | |
| tree | 23f7e52d04fe78df60ba1a94c1ef5e7106ff8e82 /cmd/podman/pods/stop.go | |
| parent | 8884f6a4f357ea64ad5f20f791ec0a09bdd36352 (diff) | |
| parent | 532c7343a9af5fbdcc682f7f93c987b1f1e49b41 (diff) | |
| download | podman-47d99fb6253238e7603fc96d5b9bbb14f1e8c948.tar.gz podman-47d99fb6253238e7603fc96d5b9bbb14f1e8c948.tar.bz2 podman-47d99fb6253238e7603fc96d5b9bbb14f1e8c948.zip | |
Merge pull request #5647 from rhatdan/containers.conf
Update podmanV2 to use containers.conf
Diffstat (limited to 'cmd/podman/pods/stop.go')
| -rw-r--r-- | cmd/podman/pods/stop.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd/podman/pods/stop.go b/cmd/podman/pods/stop.go index 683d9c00a..daf05d640 100644 --- a/cmd/podman/pods/stop.go +++ b/cmd/podman/pods/stop.go @@ -47,11 +47,10 @@ func init() { flags.BoolVarP(&stopOptions.All, "all", "a", false, "Stop all running pods") flags.BoolVarP(&stopOptions.Ignore, "ignore", "i", false, "Ignore errors when a specified pod is missing") flags.BoolVarP(&stopOptions.Latest, "latest", "l", false, "Stop the latest pod podman is aware of") - flags.UintVarP(&timeout, "time", "t", 0, "Seconds to wait for pod stop before killing the container") + flags.UintVarP(&timeout, "time", "t", containerConfig.Engine.StopTimeout, "Seconds to wait for pod stop before killing the container") if registry.IsRemote() { _ = flags.MarkHidden("latest") _ = flags.MarkHidden("ignore") - } flags.SetNormalizeFunc(utils.AliasFlags) } |