From 97bc55ee5d2b8199f2654327c05a382a537787e8 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Mon, 11 Nov 2013 11:13:16 -0700
Subject: [PATCH] Add /etc/default/docker support to upstart, too (mirroring
 sysvinit) Upstream-commit: 7cf7dda87d59981f8a1727725f6d914dcc4c1815
 Component: engine

---
 components/engine/contrib/init/upstart/docker.conf | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/components/engine/contrib/init/upstart/docker.conf b/components/engine/contrib/init/upstart/docker.conf
index 72c132c860..ee8a447c27 100644
--- a/components/engine/contrib/init/upstart/docker.conf
+++ b/components/engine/contrib/init/upstart/docker.conf
@@ -6,5 +6,10 @@ stop on runlevel [!2345]
 respawn
 
 script
-	/usr/bin/docker -d
+	DOCKER=/usr/bin/$UPSTART_JOB
+	DOCKER_OPTS=
+	if [ -f /etc/default/$UPSTART_JOB ]; then
+		. /etc/default/$UPSTART_JOB
+	fi
+	"$DOCKER" -d $DOCKER_OPTS
 end script