From c1a59ac46daa0a06af1c6a54c65cdea90a3bedbc Mon Sep 17 00:00:00 2001
From: boucher <rboucher@gmail.com>
Date: Thu, 18 Jun 2015 15:18:09 -0700
Subject: [PATCH] Don't destroy/delete the container if it has been
 checkpointed.

Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com> (github: boucher)
---
 daemon/execdriver/native/driver.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/daemon/execdriver/native/driver.go b/daemon/execdriver/native/driver.go
index 5d87c85cd5d91..a44db33210e2b 100644
--- a/daemon/execdriver/native/driver.go
+++ b/daemon/execdriver/native/driver.go
@@ -141,8 +141,11 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
 	d.activeContainers[c.ID] = cont
 	d.Unlock()
 	defer func() {
-		cont.Destroy()
-		d.cleanContainer(c.ID)
+		status, err := cont.Status()
+		if err != nil || status != libcontainer.Checkpointed {
+			cont.Destroy()
+			d.cleanContainer(c.ID)
+		}
 	}()
 
 	if err := cont.Start(p); err != nil {