From 45caf3ce23a08726c798589912187ad6b33666a8 Mon Sep 17 00:00:00 2001
From: David Calavera <david.calavera@gmail.com>
Date: Wed, 22 Jul 2015 11:24:38 -0700
Subject: [PATCH] Update init scripts to use `docker daemon`.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 346ce4f8d24de0db5ccc17151f2207cee10abc2e
Component: engine
---
 components/engine/contrib/init/openrc/docker.initd              | 2 +-
 components/engine/contrib/init/systemd/docker.service           | 2 +-
 components/engine/contrib/init/sysvinit-debian/docker           | 2 +-
 components/engine/contrib/init/sysvinit-redhat/docker           | 2 +-
 components/engine/contrib/init/sysvinit-redhat/docker.sysconfig | 2 +-
 components/engine/contrib/init/upstart/docker.conf              | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/engine/contrib/init/openrc/docker.initd b/components/engine/contrib/init/openrc/docker.initd
index a9d21b1708..221776c246 100755
--- a/components/engine/contrib/init/openrc/docker.initd
+++ b/components/engine/contrib/init/openrc/docker.initd
@@ -20,7 +20,7 @@ start() {
 		--pidfile "$DOCKER_PIDFILE" \
 		--stdout "$DOCKER_LOGFILE" \
 		--stderr "$DOCKER_LOGFILE" \
-		-- -d -p "$DOCKER_PIDFILE" \
+		-- daemon -p "$DOCKER_PIDFILE" \
 		$DOCKER_OPTS
 	eend $?
 }
diff --git a/components/engine/contrib/init/systemd/docker.service b/components/engine/contrib/init/systemd/docker.service
index 9bfc759057..5ceee65cd2 100644
--- a/components/engine/contrib/init/systemd/docker.service
+++ b/components/engine/contrib/init/systemd/docker.service
@@ -5,7 +5,7 @@ After=network.target docker.socket
 Requires=docker.socket
 
 [Service]
-ExecStart=/usr/bin/docker -d -H fd://
+ExecStart=/usr/bin/docker daemon -H fd://
 MountFlags=slave
 LimitNOFILE=1048576
 LimitNPROC=1048576
diff --git a/components/engine/contrib/init/sysvinit-debian/docker b/components/engine/contrib/init/sysvinit-debian/docker
index edb7c00170..11500a0a5d 100755
--- a/components/engine/contrib/init/sysvinit-debian/docker
+++ b/components/engine/contrib/init/sysvinit-debian/docker
@@ -107,7 +107,7 @@ case "$1" in
 			--pidfile "$DOCKER_SSD_PIDFILE" \
 			--make-pidfile \
 			-- \
-				-d -p "$DOCKER_PIDFILE" \
+				daemon -p "$DOCKER_PIDFILE" \
 				$DOCKER_OPTS \
 					>> "$DOCKER_LOGFILE" 2>&1
 		log_end_msg $?
diff --git a/components/engine/contrib/init/sysvinit-redhat/docker b/components/engine/contrib/init/sysvinit-redhat/docker
index d51e2f8ba1..6d00e3ca20 100755
--- a/components/engine/contrib/init/sysvinit-redhat/docker
+++ b/components/engine/contrib/init/sysvinit-redhat/docker
@@ -49,7 +49,7 @@ start() {
         prestart
         printf "Starting $prog:\t"
         echo "\n$(date)\n" >> $logfile
-        "$unshare" -m -- $exec -d $other_args &>> $logfile &
+        "$unshare" -m -- $exec daemon $other_args &>> $logfile &
         pid=$!
         touch $lockfile
         # wait up to 10 seconds for the pidfile to exist.  see
diff --git a/components/engine/contrib/init/sysvinit-redhat/docker.sysconfig b/components/engine/contrib/init/sysvinit-redhat/docker.sysconfig
index 5f9b7e53e6..0864b3d77f 100644
--- a/components/engine/contrib/init/sysvinit-redhat/docker.sysconfig
+++ b/components/engine/contrib/init/sysvinit-redhat/docker.sysconfig
@@ -2,6 +2,6 @@
 #
 # Other arguments to pass to the docker daemon process
 # These will be parsed by the sysv initscript and appended
-# to the arguments list passed to docker -d
+# to the arguments list passed to docker daemon
 
 other_args=""
diff --git a/components/engine/contrib/init/upstart/docker.conf b/components/engine/contrib/init/upstart/docker.conf
index 1fa9512976..ec50b35a87 100644
--- a/components/engine/contrib/init/upstart/docker.conf
+++ b/components/engine/contrib/init/upstart/docker.conf
@@ -39,7 +39,7 @@ script
 	if [ -f /etc/default/$UPSTART_JOB ]; then
 		. /etc/default/$UPSTART_JOB
 	fi
-	exec "$DOCKER" -d $DOCKER_OPTS
+	exec "$DOCKER" daemon $DOCKER_OPTS
 end script
 
 # Don't emit "started" event until docker.sock is ready.