From 317a5102614c4328591b91a53e0b461bb2a867b5 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Mon, 30 Mar 2015 13:27:38 -0700 Subject: [PATCH] Use proper wait function for --pid=host Signed-off-by: Alexander Morozov (cherry picked from commit 489ab77f4aea9bc3e7ada751cab5d827040b1e8b) Docker-DCO-1.1-Signed-off-by: Jessie Frazelle (github: jfrazelle) --- daemon/execdriver/native/driver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/execdriver/native/driver.go b/daemon/execdriver/native/driver.go index faddb34a4..795bdb8cb 100644 --- a/daemon/execdriver/native/driver.go +++ b/daemon/execdriver/native/driver.go @@ -162,7 +162,7 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba log.Warnf("Your kernel does not support OOM notifications: %s", err) } 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, // because cmd.Wait() waiting for all streams to be copied waitF = waitInPIDHost(p, cont)