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

Handle non-tty mode

Browse source 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
This commit is contained in:
Guillaume J. Charmes 2014-02-20 18:05:40 -08:00 • committed by Michael Crosby
parent 41696722fa
commit 97738ffed3
4 changed files with 70 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libcontainer/nsinit/init.go
View file

@ -27,23 +27,27 @@ func initCommand(container *libcontainer.Container, console string, pipe io.Read
return err
}
// close pipes so that we can replace it with the pty
os.Stdin.Close()
os.Stdout.Close()
os.Stderr.Close()
if console != "" {
// close pipes so that we can replace it with the pty
os.Stdin.Close()
os.Stdout.Close()
os.Stderr.Close()
slave, err := openTerminal(console, syscall.O_RDWR)
if err != nil {
return fmt.Errorf("open terminal %s", err)
}
if err := dupSlave(slave); err != nil {
return fmt.Errorf("dup2 slave %s", err)
}
}
slave, err := openTerminal(console, syscall.O_RDWR)
if err != nil {
return fmt.Errorf("open terminal %s", err)
}
if err := dupSlave(slave); err != nil {
return fmt.Errorf("dup2 slave %s", err)
}
if _, err := system.Setsid(); err != nil {
return fmt.Errorf("setsid %s", err)
}
if err := system.Setctty(); err != nil {
return fmt.Errorf("setctty %s", err)
if console != "" {
if err := system.Setctty(); err != nil {
return fmt.Errorf("setctty %s", err)
}
}
if err := system.ParentDeathSignal(); err != nil {
return fmt.Errorf("parent deth signal %s", err)