opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 03:19:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow users to disable detach keys

Browse Source 
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>
This commit is contained in:
Daniel J Walsh
2019-11-04 14:37:14 -05:00
parent a904e21cf0
commit 7c623bd41f
11 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/oci_attach_linux.go
View File

@ -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 {