summaryrefslogtreecommitdiff
path: root/cmd/podman/shared
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2019-06-19 14:25:53 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2019-06-26 13:17:04 +0200
commit5d25a4793d465896fd1762735c8bb593c4aefdfd (patch)
tree8ae160860ca625f79bfd71b0b9687335d93c0d8b /cmd/podman/shared
parentd841d088a45c6a661e6dab2fd14eea74993154f5 (diff)
downloadpodman-5d25a4793d465896fd1762735c8bb593c4aefdfd.tar.gz
podman-5d25a4793d465896fd1762735c8bb593c4aefdfd.tar.bz2
podman-5d25a4793d465896fd1762735c8bb593c4aefdfd.zip
util: drop IsCgroup2UnifiedMode and use it from cgroups
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'cmd/podman/shared')
-rw-r--r--cmd/podman/shared/create_cli.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/shared/create_cli.go b/cmd/podman/shared/create_cli.go
index 7f158b09a..4bfef8b62 100644
--- a/cmd/podman/shared/create_cli.go
+++ b/cmd/podman/shared/create_cli.go
@@ -5,9 +5,9 @@ import (
"strings"
"github.com/containers/libpod/cmd/podman/shared/parse"
+ "github.com/containers/libpod/pkg/cgroups"
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"
)
@@ -78,7 +78,7 @@ func addWarning(warnings []string, msg string) []string {
func verifyContainerResources(config *cc.CreateConfig, update bool) ([]string, error) {
warnings := []string{}
- cgroup2, err := util.IsCgroup2UnifiedMode()
+ cgroup2, err := cgroups.IsCgroup2UnifiedMode()
if err != nil || cgroup2 {
return warnings, err
}