From f00df1bf1efa2ed1ea508ea7b1c291500441571d Mon Sep 17 00:00:00 2001
From: Andrew Hsu <andrewhsu@docker.com>
Date: Thu, 23 Aug 2018 06:08:57 +0000
Subject: [PATCH] use systemctl is-active to check for containerd

The other way was not working.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
---
 containerd.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containerd.mk b/containerd.mk
index 12bad420f73..2e67b7ba987 100644
--- 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