dockerd-binary-location

Gbp-Pq: Name dockerd-binary-location.patch

diff --git a/engine/contrib/init/systemd/docker.service b/engine/contrib/init/systemd/docker.service
index 0d7b447201ea5978cf14aa67d7cfb5d4cfc01961..6d6f8976456819a67554527e45b8393d48446e96 100644 (file)
--- a/engine/contrib/init/systemd/docker.service
+++ b/engine/contrib/init/systemd/docker.service
@@ -11,7 +11,7 @@ Type=notify
 # exists and systemd currently does not support the cgroup feature set required
 # for containers run by docker
 EnvironmentFile=-/etc/default/docker
-ExecStart=/usr/bin/dockerd -H fd:// $DOCKER_OPTS
+ExecStart=/usr/sbin/dockerd -H fd:// $DOCKER_OPTS
 ExecReload=/bin/kill -s HUP $MAINPID
 LimitNOFILE=1048576
 # Having non-zero Limit*s causes performance problems due to accounting overhead

diff --git a/engine/contrib/init/sysvinit-debian/docker b/engine/contrib/init/sysvinit-debian/docker
index d5e0b4c79efc32def25a4027a7727964a8da422b..c83fe4921656dbf469d019802dbd6e39c14c43c9 100755 (executable)
--- a/engine/contrib/init/sysvinit-debian/docker
+++ b/engine/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)
-DOCKERD=/usr/bin/dockerd
+DOCKERD=/usr/sbin/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

diff --git a/engine/contrib/init/upstart/docker.conf b/engine/contrib/init/upstart/docker.conf
index 0de8065917065b6c7f482c9952176220a6ba85a1..0a27400e013c3ad88ba7276fd6461a4bba7b1474 100644 (file)
--- a/engine/contrib/init/upstart/docker.conf
+++ b/engine/contrib/init/upstart/docker.conf
@@ -15,7 +15,7 @@ kill timeout 20
 
 script
        # modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
-       DOCKERD=/usr/bin/dockerd
+       DOCKERD=/usr/sbin/dockerd
        DOCKER_OPTS=
        if [ -f /etc/default/$UPSTART_JOB ]; then
                . /etc/default/$UPSTART_JOB