浏览代码

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 <admwiggin@gmail.com> (github: tianon)
Tianon Gravi 11 年之前
父节点
当前提交
fee16d4216
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      contrib/check-config.sh

+ 1 - 1
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]"