From bc00791e9eb04c8619a4ad589ac5f3b72c2fae0d Mon Sep 17 00:00:00 2001 From: Paul Tagliamonte Date: Tue, 12 Jul 2016 15:46:35 +0100 Subject: [PATCH] remove-docker-prefix Gbp-Pq: Name remove-docker-prefix.patch --- libcontainerd/remote_linux.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcontainerd/remote_linux.go b/libcontainerd/remote_linux.go index 12ce0e10..cf18865d 100644 --- a/libcontainerd/remote_linux.go +++ b/libcontainerd/remote_linux.go @@ -30,7 +30,7 @@ const ( maxConnectionRetryCount = 3 connectionRetryDelay = 3 * time.Second containerdShutdownTimeout = 15 * time.Second - containerdBinary = "docker-containerd" + containerdBinary = "containerd" containerdPidFilename = "docker-containerd.pid" containerdSockFilename = "docker-containerd.sock" eventTimestampFilename = "event.ts" @@ -349,7 +349,7 @@ func (r *remote) runContainerdDaemon() error { } // Start a new instance - args := []string{"-l", r.rpcAddr, "--runtime", "docker-runc", "--start-timeout", "2m"} + args := []string{"-l", r.rpcAddr, "--runtime", "runc", "--start-timeout", "2m"} if r.debugLog { args = append(args, "--debug", "--metrics-interval=0") } -- 2.30.2