From 1c1cf54b0aa44553b714b82a1960b4f1199ac33a Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 10 Jan 2014 11:58:34 -0800 Subject: [PATCH] Fix tty set issue for ioctl error Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- container.go | 1 + execdriver/lxc/driver.go | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/container.go b/container.go index ab77ea047..c1f557724 100644 --- a/container.go +++ b/container.go @@ -329,6 +329,7 @@ func (container *Container) startPty() error { // stdin if container.Config.OpenStdin { container.process.Stdin = ptySlave + container.process.SysProcAttr.Setctty = true go func() { defer container.stdin.Close() utils.Debugf("startPty: begin of stdin pipe") diff --git a/execdriver/lxc/driver.go b/execdriver/lxc/driver.go index 1af76b4f4..e649263f8 100644 --- a/execdriver/lxc/driver.go +++ b/execdriver/lxc/driver.go @@ -81,7 +81,6 @@ func (d *driver) Start(c *execdriver.Process) error { c.Args = append([]string{name}, arg...) c.SysProcAttr = &syscall.SysProcAttr{Setsid: true} - c.SysProcAttr.Setctty = true if err := c.Start(); err != nil { return err