From db8e1974c0151ff33c0ccae13e20259d2ab830f6 Mon Sep 17 00:00:00 2001 From: Nikolai Lifanov Date: Sun, 14 Jun 2015 12:54:17 -0400 Subject: [PATCH] Hide unmount failures from user and to Debug. This should have been a TODO upfront. Signed-off-by: Nikolai Lifanov --- daemon/execdriver/jail/driver.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/daemon/execdriver/jail/driver.go b/daemon/execdriver/jail/driver.go index 2ae599596da4c..cd0c84c24de19 100644 --- a/daemon/execdriver/jail/driver.go +++ b/daemon/execdriver/jail/driver.go @@ -186,8 +186,12 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba if err := exec.Command("umount", root+"/dev").Run(); err != nil { logrus.Debugf("umount %s failed: %s", c.ID, err) } - exec.Command("umount", root+"/proc").Run() - exec.Command("umount", root+"/sys").Run() + if err := exec.Command("umount", root+"/proc").Run(); err != nil { + logrus.Debugf("umount %s failed: %s", c.ID, err) + } + if err := exec.Command("umount", root+"/sys").Run(); err != nil { + logrus.Debugf("umount %s failed: %s", c.ID, err) + } return execdriver.ExitStatus{ExitCode: exitCode, OOMKilled: false}, waitErr }