From d5b900ce058708e20e968a849151a1527588be51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= Date: Tue, 23 Oct 2018 15:26:41 +0200 Subject: [PATCH] use mountpoint and DockerRootDir #332 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren --- tests/1_host_configuration.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/1_host_configuration.sh b/tests/1_host_configuration.sh index a62f11f..3ecb844 100644 --- a/tests/1_host_configuration.sh +++ b/tests/1_host_configuration.sh @@ -18,11 +18,7 @@ check_1_1() { totalChecks=$((totalChecks + 1)) - if grep /var/lib/docker /etc/fstab >/dev/null 2>&1; then - pass "$check_1_1" - resulttestjson "PASS" - currentScore=$((currentScore + 1)) - elif mountpoint -q -- /var/lib/docker >/dev/null 2>&1; then + if mountpoint -q -- "$(docker info -f '{{ .DockerRootDir }}')" >/dev/null 2>&1; then pass "$check_1_1" resulttestjson "PASS" currentScore=$((currentScore + 1))