diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2017-11-15 17:58:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-15 17:58:26 -0500 |
| commit | bf8b9a37df2aeead009996875f58c59625110472 (patch) | |
| tree | 73d21edb601163fa907049a10c152917cc766a57 /libpod/container.go | |
| parent | afe1a2e7f1a54946d86588398c37c6d52c4e125c (diff) | |
| parent | acd9c668647d273488772bfcb06a0f1a44dfb411 (diff) | |
| download | podman-bf8b9a37df2aeead009996875f58c59625110472.tar.gz podman-bf8b9a37df2aeead009996875f58c59625110472.tar.bz2 podman-bf8b9a37df2aeead009996875f58c59625110472.zip | |
Merge pull request #47 from baude/terminal_attach
Fix terminal attach
Diffstat (limited to 'libpod/container.go')
| -rw-r--r-- | libpod/container.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container.go b/libpod/container.go index 7c2f921f3..d93efda97 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -393,7 +393,7 @@ func (c *Container) Exec(cmd []string, tty bool, stdin bool) (string, error) { // Attach attaches to a container // Returns fully qualified URL of streaming server for the container -func (c *Container) Attach(noStdin bool, keys string) error { +func (c *Container) Attach(noStdin bool, keys string, attached chan<- bool) error { // Check the validity of the provided keys first var err error detachKeys := []byte{} @@ -410,7 +410,7 @@ func (c *Container) Attach(noStdin bool, keys string) error { } resize := make(chan remotecommand.TerminalSize) defer close(resize) - err = c.attachContainerSocket(resize, noStdin, detachKeys) + err = c.attachContainerSocket(resize, noStdin, detachKeys, attached) if err != nil { return err } |