Merge pull request #4171 from giuseppe/allow-cgroupfs-on-cgroup

rootless: allow cgroupfs manager on cgroups v2
containers · Oct 2, 2019 · dac7889 · dac7889
2 parents 2648955 + 4ad2cd5
commit dac7889
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go
@@ -387,6 +387,9 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM
 		if err != nil {
 			return nil, err
 		}
+		if !addedResources {
+			configSpec.Linux.Resources = &spec.LinuxResources{}
+		}
 		if addedResources && !cgroup2 {
 			return nil, errors.New("invalid configuration, cannot set resources with rootless containers not using cgroups v2 unified mode")
 		}