summaryrefslogtreecommitdiff
path: root/pkg/adapter/terminal_linux.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-11-01 14:34:40 +0100
committerGitHub <noreply@github.com>2019-11-01 14:34:40 +0100
commit69165fa04d9db306809a0b110491f9a572f74431 (patch)
tree4399ffe534b5dbbb4a0963ba07a60f15c2d2eb73 /pkg/adapter/terminal_linux.go
parent9a28a12c9bc6f681558f7aa6f797765262fab81b (diff)
parent1df4dba0a0c335ad68b1c2202b8099cd87aa3d94 (diff)
downloadpodman-69165fa04d9db306809a0b110491f9a572f74431.tar.gz
podman-69165fa04d9db306809a0b110491f9a572f74431.tar.bz2
podman-69165fa04d9db306809a0b110491f9a572f74431.zip
Merge pull request #4400 from haircommander/exec-hang
Switch to bufio Reader for exec streams
Diffstat (limited to 'pkg/adapter/terminal_linux.go')
-rw-r--r--pkg/adapter/terminal_linux.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/adapter/terminal_linux.go b/pkg/adapter/terminal_linux.go
index 16e552802..3dc5864e2 100644
--- a/pkg/adapter/terminal_linux.go
+++ b/pkg/adapter/terminal_linux.go
@@ -1,6 +1,7 @@
package adapter
import (
+ "bufio"
"context"
"fmt"
"os"
@@ -61,7 +62,7 @@ func StartAttachCtr(ctx context.Context, ctr *libpod.Container, stdout, stderr,
streams := new(libpod.AttachStreams)
streams.OutputStream = stdout
streams.ErrorStream = stderr
- streams.InputStream = stdin
+ streams.InputStream = bufio.NewReader(stdin)
streams.AttachOutput = true
streams.AttachError = true
streams.AttachInput = true