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

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2019-05-11 20:27:29 +02:00
parent 42e65c57c2
commit 0e8f4ddaa9

View File

@ -107,7 +107,11 @@ func getRuntime(ctx context.Context, c *cliconfig.PodmanCommand, renumber bool,
if c.Flags().Changed("cgroup-manager") { if c.Flags().Changed("cgroup-manager") {
options = append(options, libpod.WithCgroupManager(c.GlobalFlags.CGroupManager)) options = append(options, libpod.WithCgroupManager(c.GlobalFlags.CGroupManager))
} else { } else {
if rootless.IsRootless() { unified, err := util.IsCgroup2UnifiedMode()
if err != nil {
return nil, err
}
if rootless.IsRootless() && !unified {
options = append(options, libpod.WithCgroupManager("cgroupfs")) options = append(options, libpod.WithCgroupManager("cgroupfs"))
} }
} }