diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-17 19:54:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-17 19:54:13 +0200 |
| commit | 144244aeed673957692bc6cf36c933e4b2d93a80 (patch) | |
| tree | eaf7ade613f69af364c38e7ff74b77af11731cae /pkg/spec | |
| parent | 41c4721b0b06e213e01713aa491fe877befbe077 (diff) | |
| parent | 0e8f4ddaa93b12ca02a94a0624f38416f0f75e4e (diff) | |
| download | podman-144244aeed673957692bc6cf36c933e4b2d93a80.tar.gz podman-144244aeed673957692bc6cf36c933e4b2d93a80.tar.bz2 podman-144244aeed673957692bc6cf36c933e4b2d93a80.zip | |
Merge pull request #3104 from giuseppe/initial-cgroup2
rootless: allow resource isolation with cgroup v2
Diffstat (limited to 'pkg/spec')
| -rw-r--r-- | pkg/spec/spec.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go index 20c649f9a..c2c5e0900 100644 --- a/pkg/spec/spec.go +++ b/pkg/spec/spec.go @@ -7,6 +7,7 @@ import ( "github.com/containers/libpod/libpod" "github.com/containers/libpod/pkg/rootless" + "github.com/containers/libpod/pkg/util" pmount "github.com/containers/storage/pkg/mount" "github.com/docker/docker/oci/caps" "github.com/docker/go-units" @@ -347,10 +348,13 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM } if rootless.IsRootless() { - if addedResources { - return nil, errors.New("invalid configuration, cannot set resources with rootless containers") + cgroup2, err := util.IsCgroup2UnifiedMode() + if err != nil { + return nil, err + } + if addedResources && !cgroup2 { + return nil, errors.New("invalid configuration, cannot set resources with rootless containers not using cgroups v2 unified mode") } - configSpec.Linux.Resources = &spec.LinuxResources{} } // Make sure that the bind mounts keep options like nosuid, noexec, nodev. |