Merge pull request docker-archive#156 from andrewhsu/act

[master] use systemctl is-active to check for containerd
drivenets · Aug 23, 2018 · 122405b · 122405b
2 parents 8f1a3c9 + f00df1b
commit 122405b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/containerd.mk b/containerd.mk
@@ -4,7 +4,7 @@ CONTAINERD_PROXY_COMMIT=82ae3d13e91d062dd4853379fe018638023c8da2
 CONTAINERD_SHIM_PROCESS_IMAGE=docker.io/docker/containerd-shim-process:ff98a47
 
 # If containerd is running use that socket instead
-ifeq ($(shell systemctl status containerd 2>/dev/null >/dev/null && echo -n "yes"), "yes")
+ifeq ("$(shell systemctl is-active containerd)", "active")
 CONTAINERD_SOCK:=/var/run/containerd/containerd.sock
 else
 CONTAINERD_SOCK:=/var/run/docker/containerd/docker-containerd.sock