diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-11-07 15:16:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-07 15:16:36 +0100 |
| commit | a889fd397ae56f16c71be2bf8b0a886def1559fa (patch) | |
| tree | 0341a13c2f8513f5149868b594c151a737047633 /cmd/podman/attach.go | |
| parent | aad29045531152f6b4763fe6a45e8c9daabaa0e0 (diff) | |
| parent | 7c623bd41ff3d53412531343a94e4fa5fead759f (diff) | |
| download | podman-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/attach.go')
| -rw-r--r-- | cmd/podman/attach.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/attach.go b/cmd/podman/attach.go index b78633ed6..b03673f29 100644 --- a/cmd/podman/attach.go +++ b/cmd/podman/attach.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" @@ -31,7 +32,7 @@ func init() { attachCommand.SetHelpTemplate(HelpTemplate()) attachCommand.SetUsageTemplate(UsageTemplate()) flags := attachCommand.Flags() - flags.StringVar(&attachCommand.DetachKeys, "detach-keys", "", "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 `_`") + flags.StringVar(&attachCommand.DetachKeys, "detach-keys", define.DefaultDetachKeys, "Select 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 `_`") flags.BoolVar(&attachCommand.NoStdin, "no-stdin", false, "Do not attach STDIN. The default is false") flags.BoolVar(&attachCommand.SigProxy, "sig-proxy", true, "Proxy received signals to the process") flags.BoolVarP(&attachCommand.Latest, "latest", "l", false, "Act on the latest container podman is aware of") |