summaryrefslogtreecommitdiff
path: root/cmd/podman/common.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/common.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/common.go')
-rw-r--r--cmd/podman/common.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index 442823d2d..69365201e 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -208,10 +208,14 @@ func getCreateFlags(c *cliconfig.PodmanCommand) {
"detach", "d", false,
"Run container in background and print container ID",
)
- createFlags.String(
+ detachKeys := createFlags.String(
"detach-keys", define.DefaultDetachKeys,
"Override the key sequence for detaching a container. Format is a single character `[a-Z]` or a comma separated sequence of `ctrl-<value>`, where `<value>` is one of: `a-z`, `@`, `^`, `[`, `\\`, `]`, `^` or `_`",
)
+ // Clear the default, the value specified in the config file should have the
+ // priority
+ *detachKeys = ""
+
createFlags.StringSlice(
"device", []string{},
"Add a host device to the container (default [])",