From 4168a2541967b90b0f54038f0bc6497d57f4c378 Mon Sep 17 00:00:00 2001
From: Brian Goff <cpuguy83@gmail.com>
Date: Thu, 27 Oct 2016 17:43:57 -0700
Subject: [PATCH] error out if checkpoint specified on non-experimental

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 3c0a2bb289994b190356a9753658e4cbe81a25bb
Component: engine
---
 components/engine/daemon/start.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/engine/daemon/start.go b/components/engine/daemon/start.go
index 9d06557562..475f6e600c 100644
--- a/components/engine/daemon/start.go
+++ b/components/engine/daemon/start.go
@@ -20,6 +20,10 @@ import (
 
 // ContainerStart starts a container.
 func (daemon *Daemon) ContainerStart(name string, hostConfig *containertypes.HostConfig, validateHostname bool, checkpoint string) error {
+	if checkpoint != "" && !daemon.HasExperimental() {
+		return errors.NewBadRequestError(fmt.Errorf("checkpoint is only supported in experimental mode"))
+	}
+
 	container, err := daemon.GetContainer(name)
 	if err != nil {
 		return err