kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #35172 from cpuguy83/for_linux_126_dont_abort

Browse source 
Don't abort when setting may_detach_mounts
This commit is contained in:
Sebastiaan van Stijn 2017-10-12 00:47:31 +02:00 • committed by GitHub
commit 02a2ba3e8b
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
daemon/daemon_unix.go
View file

@ -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