X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdocker.git;a=blobdiff_plain;f=docker.init;h=a3ee788a676883934ea1261087a9e025a4815c83;hp=f82a19b4721acf595ed780ef2576de2b2cf9aa02;hb=9ec3212d14a61e1cdf842a02a1d234ebb625eda3;hpb=bab24a18a99adba78710997af0992b4a2b15f42b

diff --git a/docker.init b/docker.init
index f82a19b..a3ee788 100755
--- a/docker.init
+++ b/docker.init
@@ -28,6 +28,8 @@ else
 	exit 0
 fi
 
+DOCKER_LOGFILE=/var/log/docker.log
+
 # Get service config - may override defaults
 [ -f /etc/sysconfig/docker ] && . /etc/sysconfig/docker
 
@@ -40,8 +42,19 @@ start() {
 		return
 	fi
 
+	# NOTE: docker daemon actually doesn't go to background, need to do that ourselves
+	# https://github.com/docker/docker/issues/2758
+
 	msg_starting "Docker"
-	daemon --fork /usr/bin/docker daemon $OPTIONS
+
+	touch "$DOCKER_LOGFILE"
+	chgrp docker "$DOCKER_LOGFILE"
+
+	export DOCKER_LOGFILE
+	daemon \
+		--fork --pidfile $pidfile --waitfortime 60 \
+		/usr/lib/dockerd $OPTIONS
+
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/docker
 }