Просмотр исходного кода

Merge pull request #22976 from vdemeester/22091-condition-followup

Invert CgroupDevicesEnabled condition
Sebastiaan van Stijn 9 лет назад
Родитель
Сommit
56359cccbc
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      daemon/daemon.go

+ 2 - 2
daemon/daemon.go

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