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>
This commit is contained in:
Daniel J Walsh
2020-03-27 16:26:36 -04:00
parent 9c7410d331
commit 3449b27cd1
20 changed files with 79 additions and 62 deletions

View File

@ -2161,7 +2161,7 @@ _podman_run() {
_podman_restart() {
local options_with_args="
--timeout -t
--time -t
"
local boolean_options="
--all
@ -2171,8 +2171,6 @@ _podman_restart() {
--latest
-l
--running
--timeout
-t
"
case "$cur" in
-*)
@ -2462,7 +2460,7 @@ _podman_start() {
}
_podman_stop() {
local options_with_args="
--timeout -t
--time -t
"
local boolean_options="
--all
@ -2656,7 +2654,7 @@ _podman_generate_systemd() {
local options_with_args="
--restart-policy
-t
--timeout"
--time"
local boolean_options="
-h
@ -3088,7 +3086,7 @@ _podman_pod_start() {
_podman_pod_stop() {
local options_with_args="
-t
--timeout
--time
"
local boolean_options="