浏览代码

Merge pull request #35172 from cpuguy83/for_linux_126_dont_abort

Don't abort when setting may_detach_mounts
Sebastiaan van Stijn 7 年之前
父节点
当前提交
02a2ba3e8b
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      daemon/daemon_unix.go

+ 4 - 1
daemon/daemon_unix.go

@@ -1300,7 +1300,10 @@ func setupDaemonProcess(config *config.Config) error {
 	if err := setupOOMScoreAdj(config.OOMScoreAdjust); err != nil {
 		return err
 	}
-	return setMayDetachMounts()
+	if err := setMayDetachMounts(); err != nil {
+		logrus.WithError(err).Warn("Could not set may_detach_mounts kernel parameter")
+	}
+	return nil
 }
 
 // This is used to allow removal of mountpoints that may be mounted in other