summaryrefslogtreecommitdiff
path: root/cmd/podman/common.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-11-07 15:16:36 +0100
committerGitHub <noreply@github.com>2019-11-07 15:16:36 +0100
commita889fd397ae56f16c71be2bf8b0a886def1559fa (patch)
tree0341a13c2f8513f5149868b594c151a737047633 /cmd/podman/common.go
parentaad29045531152f6b4763fe6a45e8c9daabaa0e0 (diff)
parent7c623bd41ff3d53412531343a94e4fa5fead759f (diff)
downloadpodman-a889fd397ae56f16c71be2bf8b0a886def1559fa.tar.gz
podman-a889fd397ae56f16c71be2bf8b0a886def1559fa.tar.bz2
podman-a889fd397ae56f16c71be2bf8b0a886def1559fa.zip
Merge pull request #4441 from rhatdan/detach
Allow users to disable detach keys
Diffstat (limited to 'cmd/podman/common.go')
-rw-r--r--cmd/podman/common.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index 37511641b..8afbe2e0b 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -188,7 +188,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) {
"Run container in background and print container ID",
)
createFlags.String(
- "detach-keys", "",
+ "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 `_`",
)
createFlags.StringSlice(