summaryrefslogtreecommitdiff
path: root/cmd/podman/exec.go
diff options
context:
space:
mode:
authorMarco Vedovati <mv@sba.lat>2019-12-05 21:06:34 +0100
committerMarco Vedovati <mv@sba.lat>2019-12-06 09:30:26 +0100
commit7fa5d9b39dee645c98f0c4d585dcdd7487b17ccf (patch)
tree1c88b03c81154bbefbb501d0d1b4bc5152280298 /cmd/podman/exec.go
parent465e142bf28ed04e78c8b32c0ecef6fe72a38ecc (diff)
downloadpodman-7fa5d9b39dee645c98f0c4d585dcdd7487b17ccf.tar.gz
podman-7fa5d9b39dee645c98f0c4d585dcdd7487b17ccf.tar.bz2
podman-7fa5d9b39dee645c98f0c4d585dcdd7487b17ccf.zip
Use terminal detach keys sequence specified in the config file
Fixes: #4556 Signed-off-by: Marco Vedovati <mv@sba.lat>
Diffstat (limited to 'cmd/podman/exec.go')
-rw-r--r--cmd/podman/exec.go3
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")