diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-01 15:54:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 15:54:27 +0200 |
| commit | 150778820f0f6d9f7ffdb672a8b136804378f025 (patch) | |
| tree | b959b53d288816c3c36fb5b054a19075d65a3c34 /utils | |
| parent | ed394070a895654ad3ffbabd81a3033b0c7088ff (diff) | |
| parent | 4f56964d556a7379c09a903258fd44c2232a686a (diff) | |
| download | podman-150778820f0f6d9f7ffdb672a8b136804378f025.tar.gz podman-150778820f0f6d9f7ffdb672a8b136804378f025.tar.bz2 podman-150778820f0f6d9f7ffdb672a8b136804378f025.zip | |
Merge pull request #3324 from marcov/detach-keys-configurable
libpod: specify a detach keys sequence in libpod.conf
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/utils.go | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/utils/utils.go b/utils/utils.go index 86adfb967..0ac6bc6d3 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -59,11 +59,6 @@ var ErrDetach = errors.New("detached from container") // CopyDetachable is similar to io.Copy but support a detach key sequence to break out. func CopyDetachable(dst io.Writer, src io.Reader, keys []byte) (written int64, err error) { - if len(keys) == 0 { - // Default keys : ctrl-p,ctrl-q - keys = []byte{16, 17} - } - buf := make([]byte, 32*1024) for { nr, er := src.Read(buf) |