From 1ac1b78b3a771c562d9cfa91c14f8a494c3723c1 Mon Sep 17 00:00:00 2001
From: Antonio Murdaca <runcom@redhat.com>
Date: Sun, 24 Apr 2016 14:27:19 +0200
Subject: [PATCH] contrib: init: use dockerd

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
---
 contrib/init/openrc/docker.confd            |  2 +-
 contrib/init/openrc/docker.initd            |  4 ++--
 contrib/init/systemd/docker.service         |  2 +-
 contrib/init/sysvinit-debian/docker         | 10 +++++-----
 contrib/init/sysvinit-debian/docker.default |  2 +-
 contrib/init/sysvinit-redhat/docker         |  4 ++--
 contrib/init/upstart/docker.conf            |  4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/contrib/init/openrc/docker.confd b/contrib/init/openrc/docker.confd
index ae247c007e..244403113e 100644
--- a/contrib/init/openrc/docker.confd
+++ b/contrib/init/openrc/docker.confd
@@ -7,7 +7,7 @@
 #DOCKER_PIDFILE="/run/docker.pid"
 
 # where the docker daemon itself is run from
-#DOCKER_BINARY="/usr/bin/docker"
+#DOCKERD_BINARY="/usr/bin/dockerd"
 
 # any other random options you want to pass to docker
 DOCKER_OPTS=""
diff --git a/contrib/init/openrc/docker.initd b/contrib/init/openrc/docker.initd
index ea8a3b2213..f2e1536a96 100644
--- a/contrib/init/openrc/docker.initd
+++ b/contrib/init/openrc/docker.initd
@@ -2,9 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-command="${DOCKER_BINARY:-/usr/bin/docker}"
+command="${DOCKERD_BINARY:-/usr/bin/dockerd}"
 pidfile="${DOCKER_PIDFILE:-/run/${RC_SVCNAME}.pid}"
-command_args="daemon -p \"${pidfile}\" ${DOCKER_OPTS}"
+command_args="-p \"${pidfile}\" ${DOCKER_OPTS}"
 DOCKER_LOGFILE="${DOCKER_LOGFILE:-/var/log/${RC_SVCNAME}.log}"
 start_stop_daemon_args="--background \
 	--stderr \"${DOCKER_LOGFILE}\" --stdout \"${DOCKER_LOGFILE}\""
diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service
index 6926df2397..291c73487f 100644
--- a/contrib/init/systemd/docker.service
+++ b/contrib/init/systemd/docker.service
@@ -9,7 +9,7 @@ Type=notify
 # the default is not to use systemd for cgroups because the delegate issues still
 # exists and systemd currently does not support the cgroup feature set required
 # for containers run by docker
-ExecStart=/usr/bin/docker daemon -H fd://
+ExecStart=/usr/bin/dockerd -H fd://
 ExecReload=/bin/kill -s HUP $MAINPID
 MountFlags=slave
 LimitNOFILE=1048576
diff --git a/contrib/init/sysvinit-debian/docker b/contrib/init/sysvinit-debian/docker
index fc4b05b3bb..c6a86d3401 100755
--- a/contrib/init/sysvinit-debian/docker
+++ b/contrib/init/sysvinit-debian/docker
@@ -22,7 +22,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
 BASE=docker
 
 # modify these in /etc/default/$BASE (/etc/default/docker)
-DOCKER=/usr/bin/$BASE
+DOCKERD=/usr/bin/dockerd
 # This is the pid file managed by docker itself
 DOCKER_PIDFILE=/var/run/$BASE.pid
 # This is the pid file created/managed by start-stop-daemon
@@ -39,8 +39,8 @@ if [ -f /etc/default/$BASE ]; then
 fi
 
 # Check docker is present
-if [ ! -x $DOCKER ]; then
-	log_failure_msg "$DOCKER not present or not executable"
+if [ ! -x $DOCKERD ]; then
+	log_failure_msg "$DOCKERD not present or not executable"
 	exit 1
 fi
 
@@ -103,11 +103,11 @@ case "$1" in
 		log_begin_msg "Starting $DOCKER_DESC: $BASE"
 		start-stop-daemon --start --background \
 			--no-close \
-			--exec "$DOCKER" \
+			--exec "$DOCKERD" \
 			--pidfile "$DOCKER_SSD_PIDFILE" \
 			--make-pidfile \
 			-- \
-				daemon -p "$DOCKER_PIDFILE" \
+				-p "$DOCKER_PIDFILE" \
 				$DOCKER_OPTS \
 					>> "$DOCKER_LOGFILE" 2>&1
 		log_end_msg $?
diff --git a/contrib/init/sysvinit-debian/docker.default b/contrib/init/sysvinit-debian/docker.default
index da23c57ce9..c7dc9a2a7f 100644
--- a/contrib/init/sysvinit-debian/docker.default
+++ b/contrib/init/sysvinit-debian/docker.default
@@ -8,7 +8,7 @@
 #
 
 # Customize location of Docker binary (especially for development testing).
-#DOCKER="/usr/local/bin/docker"
+#DOCKERD="/usr/local/bin/dockerd"
 
 # Use DOCKER_OPTS to modify the daemon startup options.
 #DOCKER_OPTS="--dns 8.8.8.8 --dns 8.8.4.4"
diff --git a/contrib/init/sysvinit-redhat/docker b/contrib/init/sysvinit-redhat/docker
index 3f88bb52dd..147d58035b 100755
--- a/contrib/init/sysvinit-redhat/docker
+++ b/contrib/init/sysvinit-redhat/docker
@@ -22,7 +22,7 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-prog="docker"
+prog="dockerd"
 unshare=/usr/bin/unshare
 exec="/usr/bin/$prog"
 pidfile="/var/run/$prog.pid"
@@ -56,7 +56,7 @@ start() {
         prestart
         printf "Starting $prog:\t"
         echo "\n$(date)\n" >> $logfile
-        "$unshare" -m -- $exec daemon $other_args >> $logfile 2>&1 &
+        "$unshare" -m -- $exec $other_args >> $logfile 2>&1 &
         pid=$!
         touch $lockfile
         # wait up to 10 seconds for the pidfile to exist.  see
diff --git a/contrib/init/upstart/docker.conf b/contrib/init/upstart/docker.conf
index 6cf02c5657..b5ad74a6af 100644
--- a/contrib/init/upstart/docker.conf
+++ b/contrib/init/upstart/docker.conf
@@ -34,12 +34,12 @@ end script
 
 script
 	# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
-	DOCKER=/usr/bin/$UPSTART_JOB
+	DOCKERD=/usr/bin/dockerd
 	DOCKER_OPTS=
 	if [ -f /etc/default/$UPSTART_JOB ]; then
 		. /etc/default/$UPSTART_JOB
 	fi
-	exec "$DOCKER" daemon $DOCKER_OPTS --raw-logs
+	exec "$DOCKERD" $DOCKER_OPTS --raw-logs
 end script
 
 # Don't emit "started" event until docker.sock is ready.