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/libpodruntime | |
| 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/libpodruntime')
| -rw-r--r-- | cmd/podman/libpodruntime/runtime.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go index d83a71250..2d511f7f8 100644 --- a/cmd/podman/libpodruntime/runtime.go +++ b/cmd/podman/libpodruntime/runtime.go @@ -5,6 +5,7 @@ import ( "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/libpod" + "github.com/containers/libpod/pkg/cgroups" "github.com/containers/libpod/pkg/namespaces" "github.com/containers/libpod/pkg/rootless" "github.com/containers/libpod/pkg/util" @@ -112,7 +113,7 @@ 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 { - unified, err := util.IsCgroup2UnifiedMode() + unified, err := cgroups.IsCgroup2UnifiedMode() if err != nil { return nil, err } |