From 7778049679641ab7a4c4006f93de1fb3587981af Mon Sep 17 00:00:00 2001
From: Arnaud Rebillout <arnaud.rebillout@collabora.com>
Date: Tue, 12 Nov 2019 01:18:22 +0000
Subject: [PATCH] debian-containerd-name

Gbp-Pq: Name debian-containerd-name.patch
---
 containerd/cmd/containerd-shim/main_unix.go      | 2 +-
 containerd/runtime/v1/linux/runtime.go           | 2 +-
 containerd/runtime/v2/shim/util_unix.go          | 2 +-
 engine/daemon/daemon.go                          | 2 +-
 engine/daemon/daemon_unix.go                     | 2 +-
 engine/hack/make/.binary-setup                   | 4 ++--
 engine/libcontainerd/supervisor/remote_daemon.go | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/containerd/cmd/containerd-shim/main_unix.go b/containerd/cmd/containerd-shim/main_unix.go
index 971d84eb..9dba58f0 100644
--- a/containerd/cmd/containerd-shim/main_unix.go
+++ b/containerd/cmd/containerd-shim/main_unix.go
@@ -78,7 +78,7 @@ func init() {
 	flag.BoolVar(&systemdCgroupFlag, "systemd-cgroup", false, "set runtime to use systemd-cgroup")
 	// currently, the `containerd publish` utility is embedded in the daemon binary.
 	// The daemon invokes `containerd-shim -containerd-binary ...` with its own os.Executable() path.
-	flag.StringVar(&containerdBinaryFlag, "containerd-binary", "containerd", "path to containerd binary (used for `containerd publish`)")
+	flag.StringVar(&containerdBinaryFlag, "containerd-binary", "docker-containerd", "path to containerd binary (used for `containerd publish`)")
 	flag.Parse()
 }
 
diff --git a/containerd/runtime/v1/linux/runtime.go b/containerd/runtime/v1/linux/runtime.go
index c408126a..acd92684 100644
--- a/containerd/runtime/v1/linux/runtime.go
+++ b/containerd/runtime/v1/linux/runtime.go
@@ -62,7 +62,7 @@ var (
 const (
 	configFilename = "config.json"
 	defaultRuntime = "runc"
-	defaultShim    = "containerd-shim"
+	defaultShim    = "docker-containerd-shim"
 )
 
 func init() {
diff --git a/containerd/runtime/v2/shim/util_unix.go b/containerd/runtime/v2/shim/util_unix.go
index 6b9ae4ee..898aee62 100644
--- a/containerd/runtime/v2/shim/util_unix.go
+++ b/containerd/runtime/v2/shim/util_unix.go
@@ -33,7 +33,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-const shimBinaryFormat = "containerd-shim-%s-%s"
+const shimBinaryFormat = "docker-containerd-shim-%s-%s"
 
 func getSysProcAttr() *syscall.SysProcAttr {
 	return &syscall.SysProcAttr{
diff --git a/engine/daemon/daemon.go b/engine/daemon/daemon.go
index 014ec970..6823d7b2 100644
--- a/engine/daemon/daemon.go
+++ b/engine/daemon/daemon.go
@@ -1041,7 +1041,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S
 
 	go d.execCommandGC()
 
-	d.containerd, err = libcontainerd.NewClient(ctx, d.containerdCli, filepath.Join(config.ExecRoot, "containerd"), config.ContainerdNamespace, d)
+	d.containerd, err = libcontainerd.NewClient(ctx, d.containerdCli, filepath.Join(config.ExecRoot, "docker-containerd"), config.ContainerdNamespace, d)
 	if err != nil {
 		return nil, err
 	}
diff --git a/engine/daemon/daemon_unix.go b/engine/daemon/daemon_unix.go
index 066d5232..4cc8878e 100644
--- a/engine/daemon/daemon_unix.go
+++ b/engine/daemon/daemon_unix.go
@@ -55,7 +55,7 @@ import (
 const (
 	// DefaultShimBinary is the default shim to be used by containerd if none
 	// is specified
-	DefaultShimBinary = "containerd-shim"
+	DefaultShimBinary = "docker-containerd-shim"
 
 	// DefaultRuntimeBinary is the default runtime to be used by
 	// containerd if none is specified
diff --git a/engine/hack/make/.binary-setup b/engine/hack/make/.binary-setup
index 7a4eb8bc..267871a7 100644
--- a/engine/hack/make/.binary-setup
+++ b/engine/hack/make/.binary-setup
@@ -2,9 +2,9 @@
 
 DOCKER_DAEMON_BINARY_NAME='dockerd'
 DOCKER_RUNC_BINARY_NAME='runc'
-DOCKER_CONTAINERD_BINARY_NAME='containerd'
+DOCKER_CONTAINERD_BINARY_NAME='docker-containerd'
 DOCKER_CONTAINERD_CTR_BINARY_NAME='ctr'
-DOCKER_CONTAINERD_SHIM_BINARY_NAME='containerd-shim'
+DOCKER_CONTAINERD_SHIM_BINARY_NAME='docker-containerd-shim'
 DOCKER_PROXY_BINARY_NAME='docker-proxy'
 DOCKER_INIT_BINARY_NAME='docker-init'
 DOCKER_ROOTLESSKIT_BINARY_NAME='rootlesskit'
diff --git a/engine/libcontainerd/supervisor/remote_daemon.go b/engine/libcontainerd/supervisor/remote_daemon.go
index 31b93f11..47805986 100644
--- a/engine/libcontainerd/supervisor/remote_daemon.go
+++ b/engine/libcontainerd/supervisor/remote_daemon.go
@@ -27,7 +27,7 @@ const (
 	shutdownTimeout         = 15 * time.Second
 	startupTimeout          = 15 * time.Second
 	configFile              = "containerd.toml"
-	binaryName              = "containerd"
+	binaryName              = "docker-containerd"
 	pidFile                 = "containerd.pid"
 )
 
-- 
2.30.2