From bb76157d240ae871bc3d9b6a945a982abf0473c7 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Mon, 11 Nov 2013 11:10:19 -0700
Subject: [PATCH] Fix sysvinit upstart detection and give it a pretty message

---
 contrib/init/sysvinit/docker | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/init/sysvinit/docker b/contrib/init/sysvinit/docker
index 6c0e182f08..3dc6435533 100755
--- a/contrib/init/sysvinit/docker
+++ b/contrib/init/sysvinit/docker
@@ -29,7 +29,8 @@ if [ -f /etc/default/$BASE ]; then
 	. /etc/default/$BASE
 fi
 
-if [ "$1" = start ] && which initctl >/dev/null && initctl version | grep -q upstart; then
+if which initctl >/dev/null && initctl version | grep -q upstart; then
+	log_failure_msg "Docker is managed via upstart, try using service $BASE $1"
 	exit 1
 fi