From ae1dbfa7dfe0f1e1c851cace925116b9c0b1257c Mon Sep 17 00:00:00 2001
From: Ken Cochrane <KenCochrane@gmail.com>
Date: Mon, 11 Mar 2013 17:47:28 -0700
Subject: [PATCH] added a fix to the upstart command that wasn't setting hte
 LOCALE correctly, which was causing issues with UTF-8 bundles
 Upstream-commit: 43875a73a0c2ee51f8bcd36634bbf64d836df6f8 Component: engine

---
 components/engine/puppet/modules/docker/templates/dockerd.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/engine/puppet/modules/docker/templates/dockerd.conf b/components/engine/puppet/modules/docker/templates/dockerd.conf
index a00d322bcb..c05f606391 100644
--- a/components/engine/puppet/modules/docker/templates/dockerd.conf
+++ b/components/engine/puppet/modules/docker/templates/dockerd.conf
@@ -7,5 +7,6 @@ start on runlevel [3]
 respawn
 
 script
-    /home/vagrant/dockerd/dockerd
+    test -f /etc/default/locale && . /etc/default/locale || true
+    LANG=$LANG LC_ALL=$LANG /usr/local/bin/dockerd
 end script