opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-11-29 09:37:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

libpod/info_linux.go: Remove Cgroups v1

Browse Source 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
This commit is contained in:
Lokesh Mandvekar
2025-11-05 08:39:29 -05:00
parent 4d404f1f1d
commit 7c45f43a46
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libpod/info_linux.go
View File

@@ -30,14 +30,10 @@ func (r *Runtime) setPlatformHostInfo(info *define.HostInfo) error {
return fmt.Errorf("getting Seccomp profile path: %w", err) return fmt.Errorf("getting Seccomp profile path: %w", err)
} }
// Cgroups version
unified, err := cgroups.IsCgroup2UnifiedMode()
if err != nil {
return fmt.Errorf("reading cgroups mode: %w", err)
}
// Get Map of all available controllers // Get Map of all available controllers
availableControllers, err := cgroups.AvailableControllers(nil, unified) // FIXME: AvailableControllers should be further simplified once CGv1 removal
// in container-libs is complete.
availableControllers, err := cgroups.AvailableControllers(nil, true)
if err != nil { if err != nil {
return fmt.Errorf("getting available cgroup controllers: %w", err) return fmt.Errorf("getting available cgroup controllers: %w", err)
} }
@@ -55,11 +51,7 @@ func (r *Runtime) setPlatformHostInfo(info *define.HostInfo) error {
} }
info.Slirp4NetNS = define.SlirpInfo{} info.Slirp4NetNS = define.SlirpInfo{}
cgroupVersion := "v1" info.CgroupsVersion = "v2"
if unified {
cgroupVersion = "v2"
}
info.CgroupsVersion = cgroupVersion
slirp4netnsPath := r.config.Engine.NetworkCmdPath slirp4netnsPath := r.config.Engine.NetworkCmdPath
if slirp4netnsPath == "" { if slirp4netnsPath == "" {