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 /libpod/oci_attach_linux.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 'libpod/oci_attach_linux.go')
| -rw-r--r-- | libpod/oci_attach_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/oci_attach_linux.go b/libpod/oci_attach_linux.go index eeaee6d43..46c70e7eb 100644 --- a/libpod/oci_attach_linux.go +++ b/libpod/oci_attach_linux.go @@ -152,7 +152,7 @@ func (c *Container) attachToExec(streams *AttachStreams, keys string, resize <-c func processDetachKeys(keys string) ([]byte, error) { // Check the validity of the provided keys first if len(keys) == 0 { - keys = define.DefaultDetachKeys + return []byte{}, nil } detachKeys, err := term.ToBytes(keys) if err != nil { |