summaryrefslogtreecommitdiff
path: root/cmd/podman/start.go
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-04-11 14:44:11 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-04-13 18:43:44 +0000
commit6609d555f75568bb4f1394736a3e3b31e5f0d355 (patch)
tree92cfca059a58882d205acd2c575b587850ae1798 /cmd/podman/start.go
parent5e03cec7ec83f8ff8b31a89a6180dda203b04d9c (diff)
downloadpodman-6609d555f75568bb4f1394736a3e3b31e5f0d355.tar.gz
podman-6609d555f75568bb4f1394736a3e3b31e5f0d355.tar.bz2
podman-6609d555f75568bb4f1394736a3e3b31e5f0d355.zip
Fix terminal attach
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #608 Approved by: baude
Diffstat (limited to 'cmd/podman/start.go')
-rw-r--r--cmd/podman/start.go13
1 files changed, 1 insertions, 12 deletions
diff --git a/cmd/podman/start.go b/cmd/podman/start.go
index 14b03ac7c..597ed29ae 100644
--- a/cmd/podman/start.go
+++ b/cmd/podman/start.go
@@ -110,21 +110,10 @@ func startCmd(c *cli.Context) error {
inputStream = nil
}
- attachChan, err := startAttachCtr(ctr, os.Stdout, os.Stderr, inputStream, c.String("detach-keys"))
- if err != nil {
+ if err := startAttachCtr(ctr, os.Stdout, os.Stderr, inputStream, c.String("detach-keys"), c.Bool("sig-proxy")); err != nil {
return errors.Wrapf(err, "unable to start container %s", ctr.ID())
}
- if c.Bool("sig-proxy") {
- ProxySignals(ctr)
- }
-
- // Wait for attach to complete
- err = <-attachChan
- if err != nil {
- return errors.Wrapf(err, "error attaching to container %s", ctr.ID())
- }
-
if ecode, err := ctr.ExitCode(); err != nil {
logrus.Errorf("unable to get exit code of container %s: %q", ctr.ID(), err)
} else {