From 42e65c57c28ae621ce0b75cd0bb0a9fecba1434c Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 10 May 2019 16:22:16 +0200 Subject: create: skip resources validation with cgroup v2 skip resources validation when cgroup v2 is detected, as we don't support it yet. Signed-off-by: Giuseppe Scrivano --- cmd/podman/shared/create_cli.go | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'cmd/podman') diff --git a/cmd/podman/shared/create_cli.go b/cmd/podman/shared/create_cli.go index f731e8db5..7f158b09a 100644 --- a/cmd/podman/shared/create_cli.go +++ b/cmd/podman/shared/create_cli.go @@ -7,6 +7,7 @@ import ( "github.com/containers/libpod/cmd/podman/shared/parse" cc "github.com/containers/libpod/pkg/spec" "github.com/containers/libpod/pkg/sysinfo" + "github.com/containers/libpod/pkg/util" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) @@ -76,6 +77,12 @@ func addWarning(warnings []string, msg string) []string { func verifyContainerResources(config *cc.CreateConfig, update bool) ([]string, error) { warnings := []string{} + + cgroup2, err := util.IsCgroup2UnifiedMode() + if err != nil || cgroup2 { + return warnings, err + } + sysInfo := sysinfo.New(true) // memory subsystem checks and adjustments -- cgit v1.2.3-54-g00ecf 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