Package: docker.io / 1.11.2~ds1-6

change-system-unit-env-file.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
Author: Paul R. Tagliamonte <paultag@debian.org>
Last-Update: 2014-05-07
Description: Use EnvironmentFile with the systemd unit file.
Bug-Debian: http://bugs.debian.org/746774
Forwarded: no

diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service
index 75cb68c..f98012c 100644
--- a/contrib/init/systemd/docker.service
+++ b/contrib/init/systemd/docker.service
@@ -9,7 +9,8 @@ Type=notify
 # the default is not to use systemd for cgroups because the delegate issues still
 # exists and systemd currently does not support the cgroup feature set required
 # for containers run by docker
-ExecStart=/usr/bin/docker daemon -H fd://
+EnvironmentFile=-/etc/default/docker
+ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_OPTS
 MountFlags=slave
 LimitNOFILE=1048576
 LimitNPROC=1048576