Fix shim deadlock when joining an existing pid namespace (#290)

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickaël Laventure 2016-07-15 11:49:43 -07:00 committed by Michael Crosby
parent 3abb9fc411
commit 0ac3cd1be1
6 changed files with 21 additions and 8 deletions

View file

@ -115,6 +115,7 @@ func start(log *os.File) error {
// runtime has exited so the shim can also exit
if exitShim {
// Let containerd take care of calling the runtime delete
f.Close()
p.Wait()
return nil
}