update

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

Author: lsm5

libpod/info_linux.go

@@ -30,10 +30,7 @@ func (r *Runtime) setPlatformHostInfo(info *define.HostInfo) error {
 		return fmt.Errorf("getting Seccomp profile path: %w", err)
 	}
 
-	// Get Map of all available controllers
-	// FIXME: AvailableControllers should be further simplified once CGv1 removal
-	// in container-libs is complete.
-	availableControllers, err := cgroups.AvailableControllers(nil, true)
+	availableControllers, err := cgroups.AvailableControllers()
 	if err != nil {
 		return fmt.Errorf("getting available cgroup controllers: %w", err)
 	}

libpod/oci_conmon_linux.go

@@ -216,13 +216,16 @@ func (r *ConmonOCIRuntime) moveConmonToCgroupAndSignal(ctr *Container, cmd *exec
 				logrus.StandardLogger().Logf(logLevel, "Failed to add conmon to systemd sandbox cgroup: %v", err)
 			}
 		} else {
-			control, err := cgroups.New(cgroupPath, &cgroupResources)
+			_, err := cgroups.New(cgroupPath, &cgroupResources)
 			if err != nil {
 				logrus.StandardLogger().Logf(logLevel, "Failed to add conmon to cgroupfs sandbox cgroup: %v", err)
-			} else if err := control.AddPid(cmd.Process.Pid); err != nil {
-				// we need to remove this defer and delete the cgroup once conmon exits
-				// maybe need a conmon monitor?
-				logrus.StandardLogger().Logf(logLevel, "Failed to add conmon to cgroupfs sandbox cgroup: %v", err)
+			} else {
+				// Add conmon process to the cgroup
+				cgroupProcs := filepath.Join("/sys/fs/cgroup", cgroupPath, "cgroup.procs")
+				pidStr := fmt.Sprintf("%d", cmd.Process.Pid)
+				if err := os.WriteFile(cgroupProcs, []byte(pidStr), 0o644); err != nil {
+					logrus.StandardLogger().Logf(logLevel, "Failed to add conmon to cgroupfs sandbox cgroup: %v", err)
+				}
 			}
 		}
 	}