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

11
server/container_create.go
View file

@ -38,6 +38,10 @@ const (
seccompUnconfined = "unconfined"
seccompRuntimeDefault = "runtime/default"
seccompLocalhostPrefix = "localhost/"
scopePrefix = "crio"
defaultCgroupfsParent = "/crio"
defaultSystemdParent = "system.slice"
)
func addOCIBindMounts(sb *sandbox.Sandbox, containerConfig *pb.ContainerConfig, specgen *generate.Generator) ([]oci.ContainerVolume, error) {
@ -472,11 +476,10 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID string,
}
var cgPath string
scopePrefix := "crio"
parent := "/crio"
useSystemd := s.config.CgroupManager == "systemd"
parent := defaultCgroupfsParent
useSystemd := s.config.CgroupManager == oci.SystemdCgroupsManager
if useSystemd {
parent = "system.slice"
parent = defaultSystemdParent
}
if sb.CgroupParent() != "" {
parent = sb.CgroupParent()