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

Add Wait() calls in the appropriate spots

Browse source 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
This commit is contained in:
Erik Hollensbe 2014-05-22 15:56:10 -07:00
parent 4a0d1718ee
commit 36bd5bf98b
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libcontainer/nsinit/exec.go
View file

@ -40,7 +40,9 @@ func Exec(container *libcontainer.Container, term Terminal, rootfs, dataPath str
}
command := createCommand(container, console, rootfs, dataPath, os.Args[0], syncPipe.child, args)
if err := term.Attach(command); err != nil {
command.Wait()
return -1, err
}
defer term.Close()
@ -55,6 +57,7 @@ func Exec(container *libcontainer.Container, term Terminal, rootfs, dataPath str
}
if err := WritePid(dataPath, command.Process.Pid, started); err != nil {
command.Process.Kill()
command.Process.Wait()
return -1, err
}
defer DeletePid(dataPath)
@ -64,6 +67,7 @@ func Exec(container *libcontainer.Container, term Terminal, rootfs, dataPath str
cleaner, err := SetupCgroups(container, command.Process.Pid)
if err != nil {
command.Process.Kill()
command.Process.Wait()
return -1, err
}
if cleaner != nil {
@ -72,6 +76,7 @@ func Exec(container *libcontainer.Container, term Terminal, rootfs, dataPath str
if err := InitializeNetworking(container, command.Process.Pid, syncPipe); err != nil {
command.Process.Kill()
command.Process.Wait()
return -1, err
}

4
libcontainer/nsinit/init.go
View file

@ -126,7 +126,9 @@ func RestoreParentDeathSignal(old int) error {
// Signal self if parent is already dead. Does nothing if running in a new
// PID namespace, as Getppid will always return 0.
if syscall.Getppid() == 1 {
return syscall.Kill(syscall.Getpid(), syscall.Signal(old))
err := syscall.Kill(syscall.Getpid(), syscall.Signal(old))
syscall.Wait4(syscall.Getpid(), nil, 0, nil)
return err
}
return nil