@@ -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 $?

 }

@@ -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

@@ -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 $?

@@ -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

@@ -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=""

@@ -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.