Merge pull request #14052 from Microsoft/10662-fixcgroupcheck

Windows: Fix cgroup regression
Upstream-commit: c3997daeb5db24fb1bd131d00cf3e7b87c2fe512
Component: engine
This commit is contained in:
Brian Goff
2015-06-19 21:17:39 -04:00

View File

@ -743,8 +743,9 @@ func NewDaemon(config *Config, registryService *registry.Service) (daemon *Daemo
}
sysInfo := sysinfo.New(false)
// Check if Devices cgroup is mounted, it is hard requirement for container security.
if !sysInfo.CgroupDevicesEnabled {
// Check if Devices cgroup is mounted, it is hard requirement for container security,
// on Linux/FreeBSD.
if runtime.GOOS != "windows" && !sysInfo.CgroupDevicesEnabled {
return nil, fmt.Errorf("Devices cgroup isn't mounted")
}