rootless: default --cgroup-manager=systemd in unified mode

Signed-off-by: Giuseppe Scrivano <[email protected]>
containers · May 13, 2019 · 0e8f4dd · 0e8f4dd
1 parent 42e65c5
commit 0e8f4dd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go
@@ -107,7 +107,11 @@ func getRuntime(ctx context.Context, c *cliconfig.PodmanCommand, renumber bool,
 	if c.Flags().Changed("cgroup-manager") {
 		options = append(options, libpod.WithCgroupManager(c.GlobalFlags.CGroupManager))
 	} else {
-		if rootless.IsRootless() {
+		unified, err := util.IsCgroup2UnifiedMode()
+		if err != nil {
+			return nil, err
+		}
+		if rootless.IsRootless() && !unified {
 			options = append(options, libpod.WithCgroupManager("cgroupfs"))
 		}
 	}