Merge pull request #317 from thaJeztah/17.09-backport-for_linux_126_dont_abort

[17.09] Don't abort when setting may_detach_mounts
This commit is contained in:
Andrew Hsu
2017-11-29 19:31:10 -08:00
committed by GitHub
+4 -1
View File
@@ -1298,7 +1298,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