From fee16d42163822bb23a51c5ebcb1115efc761947 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 3 Apr 2014 11:52:19 -0600 Subject: [PATCH] Update contrib/check-config.sh cgroupfs check to allow for something like '... cgroup rw,cpu' (looking at you, boot2docker) Docker-DCO-1.1-Signed-off-by: Andrew Page (github: tianon) --- contrib/check-config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/check-config.sh b/contrib/check-config.sh index 3b1ff8ad85..53bf708404 100755 --- a/contrib/check-config.sh +++ b/contrib/check-config.sh @@ -98,7 +98,7 @@ echo echo 'Generally Necessary:' echo -n '- ' -cgroupCpuDir="$(awk '/[, ]cpu[, ]/ && $8 == "cgroup" { print $5 }' /proc/$$/mountinfo | head -n1)" +cgroupCpuDir="$(awk '/[, ]cpu([, ]|$)/ && $8 == "cgroup" { print $5 }' /proc/$$/mountinfo | head -n1)" cgroupDir="$(dirname "$cgroupCpuDir")" if [ -d "$cgroupDir/cpu" ]; then echo "$(wrap_good 'cgroup hierarchy' 'properly mounted') [$cgroupDir]"