Fix sysvinit upstart detection and give it a pretty message

Upstream-commit: bb76157d240ae871bc3d9b6a945a982abf0473c7 Component: engine
2013-11-11 11:10:19 -07:00
parent bac845ad0c
commit 60cd8ebc40
1 changed files with 2 additions and 1 deletions
--- a/components/engine/contrib/init/sysvinit/docker
+++ b/components/engine/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