summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd/podman/commands.go10
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()
}