diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 2947af79a1..6899bbdfc4 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -1255,7 +1255,7 @@ func (daemon *Daemon) initCgroupsPath(path string) error { } path = filepath.Join(root, path) - sysinfo := sysinfo.New(false) + sysinfo := sysinfo.New(true) if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) { return err } diff --git a/pkg/sysinfo/sysinfo_linux.go b/pkg/sysinfo/sysinfo_linux.go index 5823ff9e80..7ad84a8309 100644 --- a/pkg/sysinfo/sysinfo_linux.go +++ b/pkg/sysinfo/sysinfo_linux.go @@ -82,23 +82,23 @@ func checkCgroupMem(cgMounts map[string]string, quiet bool) cgroupMemInfo { swapLimit := cgroupEnabled(mountPoint, "memory.memsw.limit_in_bytes") if !quiet && !swapLimit { - logrus.Warn("Your kernel does not support swap memory limit.") + logrus.Warn("Your kernel does not support swap memory limit") } memoryReservation := cgroupEnabled(mountPoint, "memory.soft_limit_in_bytes") if !quiet && !memoryReservation { - logrus.Warn("Your kernel does not support memory reservation.") + logrus.Warn("Your kernel does not support memory reservation") } oomKillDisable := cgroupEnabled(mountPoint, "memory.oom_control") if !quiet && !oomKillDisable { - logrus.Warn("Your kernel does not support oom control.") + logrus.Warn("Your kernel does not support oom control") } memorySwappiness := cgroupEnabled(mountPoint, "memory.swappiness") if !quiet && !memorySwappiness { - logrus.Warn("Your kernel does not support memory swappiness.") + logrus.Warn("Your kernel does not support memory swappiness") } kernelMemory := cgroupEnabled(mountPoint, "memory.kmem.limit_in_bytes") if !quiet && !kernelMemory { - logrus.Warn("Your kernel does not support kernel memory limit.") + logrus.Warn("Your kernel does not support kernel memory limit") } return cgroupMemInfo{