Updated mountpoint check to support user namespace

Author: markdumay

tests/1_host_configuration.sh

@@ -73,9 +73,12 @@ check_1_2_1() {
   starttestjson "$id_1_2_1" "$desc_1_2_1"
 
   totalChecks=$((totalChecks + 1))
-  local system_partition=$(df / --output=source 2> /dev/null | sed -n 2p)
-  local docker_partition=$(df "$(docker info -f '{{ .DockerRootDir }}')" --output=source 2> /dev/null | sed -n 2p)
-  if [ "$system_partition" != "$docker_partition" ] && [ ! -z "$docker_partition" ] ; then
+  docker_root_dir=$(docker info -f '{{ .DockerRootDir }}')
+  if docker info | grep -q userns ; then
+    docker_root_dir=$(readlink -f "$docker_root_dir/..")
+  fi
+
+  if mountpoint -q -- "$docker_root_dir" >/dev/null 2>&1; then
     pass "$check_1_2_1"
     resulttestjson "PASS"
     currentScore=$((currentScore + 1))