Browse Source

Fix sysvinit upstart detection and give it a pretty message

Tianon Gravi 11 years ago
parent
commit
bb76157d24
1 changed files with 2 additions and 1 deletions
  1. 2 1
      contrib/init/sysvinit/docker

+ 2 - 1
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