diff options
| author | baude <bbaude@redhat.com> | 2017-11-08 15:14:33 -0600 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2017-11-15 16:27:57 -0600 |
| commit | acd9c668647d273488772bfcb06a0f1a44dfb411 (patch) | |
| tree | 5ff634e00c700b16f1ae4369df4ea021a4888073 /libpod/container.go | |
| parent | 5cfd7a313fcae7c748b5bae84de779b28d4ea01b (diff) | |
| download | podman-acd9c668647d273488772bfcb06a0f1a44dfb411.tar.gz podman-acd9c668647d273488772bfcb06a0f1a44dfb411.tar.bz2 podman-acd9c668647d273488772bfcb06a0f1a44dfb411.zip | |
Fix terminal attach
Re-order the startup of a new container via run from
initialize > start > attach to initialize > attach > start.
This fixes output when running:
kpod run -i -t IMAGE command
and
kpod run IMAGE command
Signed-off-by: baude <bbaude@redhat.com>
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 } |