diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-06-19 14:25:53 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-06-26 13:17:04 +0200 |
| commit | 5d25a4793d465896fd1762735c8bb593c4aefdfd (patch) | |
| tree | 8ae160860ca625f79bfd71b0b9687335d93c0d8b /cmd/podman/main_local.go | |
| parent | d841d088a45c6a661e6dab2fd14eea74993154f5 (diff) | |
| download | podman-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/main_local.go')
| -rw-r--r-- | cmd/podman/main_local.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/main_local.go b/cmd/podman/main_local.go index 7a062cb4b..d5f70a28f 100644 --- a/cmd/podman/main_local.go +++ b/cmd/podman/main_local.go @@ -13,6 +13,7 @@ import ( "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/libpod" + "github.com/containers/libpod/pkg/cgroups" "github.com/containers/libpod/pkg/rootless" "github.com/containers/libpod/pkg/tracing" "github.com/containers/libpod/pkg/util" @@ -31,7 +32,7 @@ func init() { cgroupManager = runtimeConfig.CgroupManager } cgroupHelp := "Cgroup manager to use (cgroupfs or systemd)" - cgroupv2, _ := util.IsCgroup2UnifiedMode() + cgroupv2, _ := cgroups.IsCgroup2UnifiedMode() if rootless.IsRootless() && !cgroupv2 { cgroupManager = "" cgroupHelp = "Cgroup manager is not supported in rootless mode" |