From: Paul Tagliamonte <paultag@debian.org>
Date: Tue, 12 Jul 2016 14:46:35 +0000 (+0100)
Subject: remove-docker-prefix
X-Git-Tag: archive/raspbian/18.09.1+dfsg1-7+rpi1~1^2^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bc00791e9eb04c8619a4ad589ac5f3b72c2fae0d;p=docker.io.git

remove-docker-prefix


Gbp-Pq: Name remove-docker-prefix.patch
---

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")
 	}