From 0e8f4ddaa93b12ca02a94a0624f38416f0f75e4e Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sat, 11 May 2019 20:27:29 +0200 Subject: rootless: default --cgroup-manager=systemd in unified mode Signed-off-by: Giuseppe Scrivano --- cmd/podman/libpodruntime/runtime.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'cmd/podman') diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go index b533dc056..b8d77602d 100644 --- 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")) } } -- cgit v1.2.3-54-g00ecf