From 3002cc7a7635ee6ec552c4833ac2c5d550c95111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Sat, 18 May 2019 00:03:26 +0200
Subject: [PATCH] Fix for using with newer github.com/opencontainers/runc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
---
 validate/validate.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/validate/validate.go b/validate/validate.go
index b2db5580..2f3a60eb 100644
--- a/validate/validate.go
+++ b/validate/validate.go
@@ -139,7 +139,7 @@ func validateCpuCfsBandwidth(available_cgroups map[string]int) string {
 	if !ok {
 		return "\tCpu cfs bandwidth status unknown: cpu cgroup not enabled.\n"
 	}
-	mnt, err := cgroups.FindCgroupMountpoint("cpu")
+	mnt, err := cgroups.FindCgroupMountpoint("", "cpu")
 	if err != nil {
 		return "\tCpu cfs bandwidth status unknown: cpu cgroup not mounted.\n"
 	}
@@ -156,7 +156,7 @@ func validateMemoryAccounting(available_cgroups map[string]int) string {
 	if !ok {
 		return "\tHierarchical memory accounting status unknown: memory cgroup not enabled.\n"
 	}
-	mnt, err := cgroups.FindCgroupMountpoint("memory")
+	mnt, err := cgroups.FindCgroupMountpoint("", "memory")
 	if err != nil {
 		return "\tHierarchical memory accounting status unknown: memory cgroup not mounted.\n"
 	}
@@ -216,7 +216,7 @@ func validateDockerInfo() (string, string) {
 func validateCgroupMounts() (string, string) {
 	const recommendedMount = "/sys/fs/cgroup"
 	desc := fmt.Sprintf("\tAny cgroup mount point that is detectible and accessible is supported. %s is recommended as a standard location.\n", recommendedMount)
-	mnt, err := cgroups.FindCgroupMountpoint("cpu")
+	mnt, err := cgroups.FindCgroupMountpoint("", "cpu")
 	if err != nil {
 		out := "Could not locate cgroup mount point.\n"
 		out += desc
-- 
2.21.0