containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use proper wait function for --pid=host 

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
This commit is contained in:
Alexander Morozov 2015-03-30 13:27:38 -07:00
parent 924d503cb1
commit 489ab77f4a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/execdriver/native/driver.go
View File

@ -162,7 +162,7 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
logrus.Warnf("Your kernel does not support OOM notifications: %s", err) logrus.Warnf("Your kernel does not support OOM notifications: %s", err)
} }
waitF := p.Wait waitF := p.Wait
if nss := cont.Config().Namespaces; nss.Contains(configs.NEWPID) { if nss := cont.Config().Namespaces; !nss.Contains(configs.NEWPID) {
// we need such hack for tracking processes with inerited fds, // we need such hack for tracking processes with inerited fds,
// because cmd.Wait() waiting for all streams to be copied // because cmd.Wait() waiting for all streams to be copied
waitF = waitInPIDHost(p, cont) waitF = waitInPIDHost(p, cont)