opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 18:59:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3169 from giuseppe/rootless-empty-res-cgroup1

Browse Source 
rootless: force resources to be nil on cgroup v1
This commit is contained in:
OpenShift Merge Robot
2019-05-21 12:49:15 +02:00
committed by GitHub
parent e43a98e512 14fe39968f
commit 773b9ac9d0
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/spec/spec.go
View File

@ -357,6 +357,10 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM
if addedResources && !cgroup2 {
return nil, errors.New("invalid configuration, cannot set resources with rootless containers not using cgroups v2 unified mode")
}
if !cgroup2 {
// Force the resources block to be empty instead of having default values.
configSpec.Linux.Resources = &spec.LinuxResources{}
}
}
// Make sure that the bind mounts keep options like nosuid, noexec, nodev.