Pass tty master to Exec

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 332755b99d345a8ffbf4fb636ca8fed604a233c0
Component: engine

components/engine/pkg/libcontainer/nsinit/exec.go

@@ -19,9 +19,8 @@ import (
 
 // Exec performes setup outside of a namespace so that a container can be
 // executed.  Exec is a high level function for working with container namespaces.
-func Exec(container *libcontainer.Container, stdin io.Reader, stdout, stderr io.Writer, logFile string, args []string) (int, error) {
+func Exec(container *libcontainer.Container, stdin io.Reader, stdout, stderr io.Writer, master *os.File, logFile string, args []string) (int, error) {
 	var (
-		master  *os.File
 		console string
 		err     error
 

components/engine/pkg/libcontainer/nsinit/nsinit/main.go

@@ -58,7 +58,7 @@ func main() {
 			exitCode, err = nsinit.ExecIn(container, nspid, flag.Args()[1:])
 		} else {
 			exitCode, err = nsinit.Exec(container,
-				os.Stdin, os.Stdout, os.Stderr,
+				os.Stdin, os.Stdout, os.Stderr, nil,
 				logFile, flag.Args()[1:])
 		}
 		if err != nil {