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/common.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/common.go')
| -rw-r--r-- | cmd/podman/common.go | 6 |
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 [])", |