From 743a9e8b073005e9d26a6dde92ba24273fd45d68 Mon Sep 17 00:00:00 2001
From: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Date: Wed, 1 Jun 2016 13:00:25 -0700
Subject: [PATCH] Increase containerd start-timeout to 2 minutes

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 4251e1e99e16ff7ff5557ee16e5bef26a14cd127)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 64a91ee74e73c956e92801447ae73ba82d168ed5
Component: engine
---
 components/engine/libcontainerd/remote_linux.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/engine/libcontainerd/remote_linux.go b/components/engine/libcontainerd/remote_linux.go
index 1a6ccf387c..883c84b743 100644
--- a/components/engine/libcontainerd/remote_linux.go
+++ b/components/engine/libcontainerd/remote_linux.go
@@ -357,6 +357,7 @@ func (r *remote) runContainerdDaemon() error {
 		"--shim", "docker-containerd-shim",
 		"--runtime", "docker-runc",
 		"--metrics-interval=0",
+		"--start-timeout", "2m",
 		"--state-dir", filepath.Join(r.stateDir, containerdStateDir),
 	}
 	if r.debugLog {