From 5d7ed4d6e70cd8921e0bc26d275f610d603bda87 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Tue, 23 Feb 2016 23:44:00 -0500
Subject: [PATCH] AWS kube-up: Stop docker before moving /mnt/docker

On Jessie, we now preinstall Docker.  Before moving /mnt/docker, make
sure we stop the docker service.
---
 cluster/aws/templates/format-disks.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cluster/aws/templates/format-disks.sh b/cluster/aws/templates/format-disks.sh
index 9afc1b93fd9..adf3396778d 100644
--- a/cluster/aws/templates/format-disks.sh
+++ b/cluster/aws/templates/format-disks.sh
@@ -190,6 +190,9 @@ else
 fi
 
 if [[ -n "${move_docker}" ]]; then
+  # Stop docker if it is running, so we can move its files
+  systemctl stop docker || true
+
   # Move docker to e.g. /mnt
   # but only if it is a directory, not a symlink left over from a previous run
   if [[ -d /var/lib/docker ]]; then