From: Dmitry Smirnov Date: Sat, 26 Jan 2019 01:54:38 +0000 (+0000) Subject: dockerd-binary-location X-Git-Tag: archive/raspbian/18.09.1+dfsg1-7+rpi1~15 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ce71afd0a9de9e80d5a12815e23898c1e5496100;p=docker.io.git 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 0d7b4472..6d6f8976 100644 --- 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 d5e0b4c7..c83fe492 100755 --- 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 0de80659..0a27400e 100644 --- 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