vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Pass tty master to Exec

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-02-21 16:40:32 -08:00
parent b3d2325c5f
commit fa64bff715
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libcontainer/nsinit/exec.go
View file

@ -19,9 +19,8 @@ import (
// Exec performes setup outside of a namespace so that a container can be // 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. // 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 ( var (
master *os.File
console string console string
err error err error

2
libcontainer/nsinit/nsinit/main.go
View file

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