1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

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)
This commit is contained in:
Tianon Gravi 2014-04-03 11:52:19 -06:00
parent 9712f8127a
commit fee16d4216

View file

@ -98,7 +98,7 @@ echo
echo 'Generally Necessary:' echo 'Generally Necessary:'
echo -n '- ' 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")" cgroupDir="$(dirname "$cgroupCpuDir")"
if [ -d "$cgroupDir/cpu" ]; then if [ -d "$cgroupDir/cpu" ]; then
echo "$(wrap_good 'cgroup hierarchy' 'properly mounted') [$cgroupDir]" echo "$(wrap_good 'cgroup hierarchy' 'properly mounted') [$cgroupDir]"