common/pkg/config: cleanup defaultCgroupManager

lsm5 · lsm5 · commit c30076c8023b · 2025-10-24T18:59:30.000-04:00
Signed-off-by: Lokesh Mandvekar &lt;lsm5@redhat.com&gt;
diff --git a/common/pkg/config/systemd.go b/common/pkg/config/systemd.go
@@ -7,9 +7,7 @@ import (
 	"path/filepath"
 	"sync"
 
-	"go.podman.io/common/pkg/cgroups"
 	"go.podman.io/common/pkg/systemd"
-	"go.podman.io/storage/pkg/unshare"
 )
 
 var (
@@ -26,11 +24,6 @@ func defaultCgroupManager() string {
 	if !useSystemd() {
 		return CgroupfsCgroupsManager
 	}
-	enabled, err := cgroups.IsCgroup2UnifiedMode()
-	if err == nil && !enabled && unshare.IsRootless() {
-		return CgroupfsCgroupsManager
-	}
-
 	return SystemdCgroupsManager
 }
 

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,7 @@ import (`
`7`	`7`	`"path/filepath"`
`8`	`8`	`"sync"`
`9`	`9`
`10`		`- "go.podman.io/common/pkg/cgroups"`
`11`	`10`	`"go.podman.io/common/pkg/systemd"`
`12`		`- "go.podman.io/storage/pkg/unshare"`
`13`	`11`	`)`
`14`	`12`
`15`	`13`	`var (`
`@@ -26,11 +24,6 @@ func defaultCgroupManager() string {`
`26`	`24`	`if !useSystemd() {`
`27`	`25`	`return CgroupfsCgroupsManager`
`28`	`26`	`}`
`29`		`- enabled, err := cgroups.IsCgroup2UnifiedMode()`
`30`		`- if err == nil && !enabled && unshare.IsRootless() {`
`31`		`- return CgroupfsCgroupsManager`
`32`		`- }`
`33`		`-`
`34`	`27`	`return SystemdCgroupsManager`
`35`	`28`	`}`
`36`	`29`