diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-06 02:48:24 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-06 02:48:24 -0800 |
| commit | e9c48206019be6b95b5cc8700945b773a857ae26 (patch) | |
| tree | a2581eb3bc67fef65a2f3834afd34f11c8df5d03 /cmd/podman/exec.go | |
| parent | 5c6eb1a94eb2688b28209997cbf18fa4aff97fe0 (diff) | |
| parent | 7fa5d9b39dee645c98f0c4d585dcdd7487b17ccf (diff) | |
| download | podman-e9c48206019be6b95b5cc8700945b773a857ae26.tar.gz podman-e9c48206019be6b95b5cc8700945b773a857ae26.tar.bz2 podman-e9c48206019be6b95b5cc8700945b773a857ae26.zip | |
Merge pull request #4651 from marcov/detach-config
Use terminal detach keys sequence specified in the config file
Diffstat (limited to 'cmd/podman/exec.go')
| -rw-r--r-- | cmd/podman/exec.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/podman/exec.go b/cmd/podman/exec.go index afa701897..8dcec24ce 100644 --- a/cmd/podman/exec.go +++ b/cmd/podman/exec.go @@ -36,6 +36,9 @@ func init() { flags := execCommand.Flags() flags.SetInterspersed(false) flags.StringVar(&execCommand.DetachKeys, "detach-keys", define.DefaultDetachKeys, "Select the key sequence for detaching a container. Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _") + // Clear the default, the value specified in the config file should have the + // priority + execCommand.DetachKeys = "" flags.StringArrayVarP(&execCommand.Env, "env", "e", []string{}, "Set environment variables") flags.BoolVarP(&execCommand.Interactive, "interactive", "i", false, "Keep STDIN open even if not attached") flags.BoolVarP(&execCommand.Latest, "latest", "l", false, "Act on the latest container podman is aware of") |