common: remove pkg/cgroupv2

Replace with cgroups.IsCgroup2UnifiedMode.

Signed-off-by: Lokesh Mandvekar <[email protected]>

Author: lsm5

common/pkg/cgroupv2/cgroups_linux.go

@@ -15,7 +15,7 @@ import (
 	"go.podman.io/common/internal/attributedstring"
 	nettypes "go.podman.io/common/libnetwork/types"
 	"go.podman.io/common/pkg/apparmor"
-	"go.podman.io/common/pkg/cgroupv2"
+	"go.podman.io/common/pkg/cgroups"
 	"go.podman.io/storage/pkg/fileutils"
 	"go.podman.io/storage/pkg/homedir"
 	"go.podman.io/storage/pkg/unshare"
@@ -231,7 +231,7 @@ func defaultConfig() (*Config, error) {
 	}
 
 	cgroupNS := "host"
-	if cgroup2, _ := cgroupv2.Enabled(); cgroup2 {
+	if cgroup2, _ := cgroups.IsCgroup2UnifiedMode(); cgroup2 {
 		cgroupNS = "private"
 	}
 
@@ -652,7 +652,7 @@ func (c *Config) PidsLimit() int64 {
 		if c.Engine.CgroupManager != SystemdCgroupsManager {
 			return 0
 		}
-		cgroup2, _ := cgroupv2.Enabled()
+		cgroup2, _ := cgroups.IsCgroup2UnifiedMode()
 		if !cgroup2 {
 			return 0
 		}

common/pkg/cgroupv2/cgroups_unsupported.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"sync"
 
-	"go.podman.io/common/pkg/cgroupv2"
+	"go.podman.io/common/pkg/cgroups"
 	"go.podman.io/common/pkg/systemd"
 	"go.podman.io/storage/pkg/unshare"
 )
@@ -26,7 +26,7 @@ func defaultCgroupManager() string {
 	if !useSystemd() {
 		return CgroupfsCgroupsManager
 	}
-	enabled, err := cgroupv2.Enabled()
+	enabled, err := cgroups.IsCgroup2UnifiedMode()
 	if err == nil && !enabled && unshare.IsRootless() {
 		return CgroupfsCgroupsManager
 	}

common/pkg/config/default.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/opencontainers/cgroups"
 	"github.com/sirupsen/logrus"
-	"go.podman.io/common/pkg/cgroupv2"
+	cgroup2 "go.podman.io/common/pkg/cgroups"
 	"go.podman.io/storage/pkg/fileutils"
 	"golang.org/x/sys/unix"
 )
@@ -229,7 +229,7 @@ func checkCgroupCpusetInfo(cgMounts map[string]string, quiet bool) cgroupCpusetI
 
 // checkCgroupPids reads the pids information from the pids cgroup mount point.
 func checkCgroupPids(cgMounts map[string]string, quiet bool) cgroupPids {
-	cgroup2, err := cgroupv2.Enabled()
+	cgroup2, err := cgroup2.IsCgroup2UnifiedMode()
 	if err != nil {
 		logrus.Errorf("Failed to check cgroups version: %v", err)
 		return cgroupPids{}