16 lines
596 B
Diff
16 lines
596 B
Diff
|
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go
|
||
|
|
index 9d1347cc..f1f2b963 100644
|
||
|
|
--- a/cmd/podman/libpodruntime/runtime.go
|
||
|
|
+++ b/cmd/podman/libpodruntime/runtime.go
|
||
|
|
@@ -105,6 +105,10 @@ func GetRuntimeWithStorageOpts(c *cli.Context, storageOpts *storage.StoreOptions
|
||
|
|
|
||
|
|
if c.GlobalIsSet("cgroup-manager") {
|
||
|
|
options = append(options, libpod.WithCgroupManager(c.GlobalString("cgroup-manager")))
|
||
|
|
+ } else {
|
||
|
|
+ if rootless.IsRootless() {
|
||
|
|
+ options = append(options, libpod.WithCgroupManager("cgroupfs"))
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
// TODO flag to set libpod static dir?
|