diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-12 03:21:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-12 03:21:01 -0700 |
| commit | 4a1bb394a251598e6414da6d57e36365f5e06f86 (patch) | |
| tree | 014350bd21e898382cc0565bb1e5d0041a308558 | |
| parent | 811c5dea8dc5b7fea5b70ca027c34221bde32b9e (diff) | |
| parent | 60dc80f9f372f3600c640e3995b1fc72ad862bbe (diff) | |
| download | podman-4a1bb394a251598e6414da6d57e36365f5e06f86.tar.gz podman-4a1bb394a251598e6414da6d57e36365f5e06f86.tar.bz2 podman-4a1bb394a251598e6414da6d57e36365f5e06f86.zip | |
Merge pull request #6122 from rhatdan/pids
Set pids-limit to 0 on non cgroupv2 rootless systems
| -rw-r--r-- | cmd/podman/commands.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cmd/podman/commands.go b/cmd/podman/commands.go index 2ee31b643..2aa9b94b8 100644 --- a/cmd/podman/commands.go +++ b/cmd/podman/commands.go @@ -7,6 +7,7 @@ import ( "os" "github.com/containers/buildah/pkg/parse" + "github.com/containers/common/pkg/config" "github.com/containers/libpod/pkg/apparmor" "github.com/containers/libpod/pkg/cgroups" "github.com/containers/libpod/pkg/rootless" @@ -179,10 +180,13 @@ func getDefaultUserNS() string { func getDefaultPidsLimit() int64 { if rootless.IsRootless() { - cgroup2, _ := cgroups.IsCgroup2UnifiedMode() - if cgroup2 { - return defaultContainerConfig.Containers.PidsLimit + if defaultContainerConfig.Engine.CgroupManager == config.SystemdCgroupsManager { + cgroup2, _ := cgroups.IsCgroup2UnifiedMode() + if cgroup2 { + return defaultContainerConfig.Containers.PidsLimit + } } + return 0 } return sysinfo.GetDefaultPidsLimit() } |