diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-17 19:54:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-17 19:54:13 +0200 |
| commit | 144244aeed673957692bc6cf36c933e4b2d93a80 (patch) | |
| tree | eaf7ade613f69af364c38e7ff74b77af11731cae /cmd/podman/libpodruntime | |
| parent | 41c4721b0b06e213e01713aa491fe877befbe077 (diff) | |
| parent | 0e8f4ddaa93b12ca02a94a0624f38416f0f75e4e (diff) | |
| download | podman-144244aeed673957692bc6cf36c933e4b2d93a80.tar.gz podman-144244aeed673957692bc6cf36c933e4b2d93a80.tar.bz2 podman-144244aeed673957692bc6cf36c933e4b2d93a80.zip | |
Merge pull request #3104 from giuseppe/initial-cgroup2
rootless: allow resource isolation with cgroup v2
Diffstat (limited to 'cmd/podman/libpodruntime')
| -rw-r--r-- | cmd/podman/libpodruntime/runtime.go | 6 |
1 files changed, 5 insertions, 1 deletions
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")) } } |