diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-05-10 16:20:55 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-05-13 10:48:16 +0200 |
| commit | 8e88461511e81d2327e4c1a1315bb58fda1827ca (patch) | |
| tree | 6c70b602f48ab8eaf8e327a314b929eb5bebd22a /pkg/spec | |
| parent | d2571c7fd49d22e822a6f3b3796488218c9f9e46 (diff) | |
| download | podman-8e88461511e81d2327e4c1a1315bb58fda1827ca.tar.gz podman-8e88461511e81d2327e4c1a1315bb58fda1827ca.tar.bz2 podman-8e88461511e81d2327e4c1a1315bb58fda1827ca.zip | |
rootless, spec: allow resources with cgroup v2
We were always raising an error when the rootless user attempted to
setup resources, but this is not the case anymore with cgroup v2.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
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. |