debian-dockerd-binary-location

Gbp-Pq: Name debian-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 9c8fa6be73e3188f48c6685a65125131119e352e..4d7cbd7cdc41b5deec56d53b8031f7bdaaf01221 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 d58f7d6ac8eb010dfbcfa81a2aa4f32e37b12650..71978b6c74580b36a8078a26de433fd86ce2feba 100644 (file)
--- a/engine/contrib/init/upstart/docker.conf
+++ b/engine/contrib/init/upstart/docker.conf
@@ -38,7 +38,7 @@ end script
 
 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