diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2019-11-04 14:37:14 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2019-11-05 14:10:43 -0500 |
| commit | 7c623bd41ff3d53412531343a94e4fa5fead759f (patch) | |
| tree | cc4b904f5a5c2fcfb5388c502125f5416e821ab2 /cmd/podman/exec.go | |
| parent | a904e21cf0213185fd115683dc2adc4baeff922a (diff) | |
| download | podman-7c623bd41ff3d53412531343a94e4fa5fead759f.tar.gz podman-7c623bd41ff3d53412531343a94e4fa5fead759f.tar.bz2 podman-7c623bd41ff3d53412531343a94e4fa5fead759f.zip | |
Allow users to disable detach keys
If user specifies --detach-keys="", this will disable the feature.
Adding define.DefaultDetachKeys to help screen to help identify detach keys.
Updated man pages with additonal information.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd/podman/exec.go')
| -rw-r--r-- | cmd/podman/exec.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/exec.go b/cmd/podman/exec.go index 649a7b0db..afa701897 100644 --- a/cmd/podman/exec.go +++ b/cmd/podman/exec.go @@ -2,6 +2,7 @@ package main import ( "github.com/containers/libpod/cmd/podman/cliconfig" + "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/adapter" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -34,7 +35,7 @@ func init() { execCommand.SetUsageTemplate(UsageTemplate()) flags := execCommand.Flags() flags.SetInterspersed(false) - flags.StringVar(&execCommand.DetachKeys, "detach-keys", "", "Override 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 _") + 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 _") 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") |