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/shared/create_cli.go | |
| 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/shared/create_cli.go')
| -rw-r--r-- | cmd/podman/shared/create_cli.go | 7 |
1 files changed, 7 insertions, 0 deletions
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 |