Merge pull request moby#4 from lifanov/freebsd-compat

Hide unmount failures from user and to Debug.
tucksaun · Jul 1, 2015 · b1c37d2 · b1c37d2
2 parents 582db78 + db8e197
commit b1c37d2
Showing 1 changed file with 6 additions and 2 deletions.
diff --git 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
 }