Merge pull request #179 from coroot/fix_cgroup2_path

enhance accuracy of cgroup2 base path detection
coroot · Feb 14, 2025 · 5306dcd · 5306dcd
2 parents 2e749e9 + 1260e7f
commit 5306dcd
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/cgroup/cgroup_linux.go b/cgroup/cgroup_linux.go
@@ -4,6 +4,7 @@ import (
 	"os"
 	"path"
 	"runtime"
+	"strings"
 
 	"github.com/vishvananda/netns"
 	"golang.org/x/sys/unix"
@@ -38,7 +39,14 @@ func Init() error {
 		}
 	}
 	if _, err := os.Stat(path.Join(cgRoot, "unified")); err == nil {
-		cg2Root = path.Join(cgRoot, "unified")
+		if data, err := os.ReadFile("/proc/self/mounts"); err == nil {
+			for _, line := range strings.Split(string(data), "\n") {
+				if strings.Contains(line, "cgroup/unified") {
+					cg2Root = path.Join(cgRoot, "unified")
+					break
+				}
+			}
+		}
 	}
 	klog.Infoln("cgroup v2 root is", cg2Root)
 	return nil