diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-02 09:40:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 09:40:19 -0700 |
| commit | dac7889d134e1c8f2b26a73b93312c3463367178 (patch) | |
| tree | ab5b4d99f20f532c5ac851a2009a24d9d592df46 | |
| parent | 2648955cf5886299aedb37a7e4da542edbd0d5d8 (diff) | |
| parent | 4ad2cd54a11e831a8e00560bc54e54a7bd534cf3 (diff) | |
| download | podman-dac7889d134e1c8f2b26a73b93312c3463367178.tar.gz podman-dac7889d134e1c8f2b26a73b93312c3463367178.tar.bz2 podman-dac7889d134e1c8f2b26a73b93312c3463367178.zip | |
Merge pull request #4171 from giuseppe/allow-cgroupfs-on-cgroup
rootless: allow cgroupfs manager on cgroups v2
| -rw-r--r-- | pkg/spec/spec.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go index 38f9c7306..c7aa003e8 100644 --- 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") } |