vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

*: constify cgroups stuff

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2017-08-29 23:11:30 +02:00
parent c199f63dba
commit f51ca87857
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
4 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/sandbox_run.go
View file

@ -325,7 +325,7 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
// setup cgroup settings
cgroupParent := req.GetConfig().GetLinux().CgroupParent
if cgroupParent != "" {
if s.config.CgroupManager == "systemd" {
if s.config.CgroupManager == oci.SystemdCgroupsManager {
cgPath, err := convertCgroupNameToSystemd(cgroupParent, false)
if err != nil {
return nil, err