debian-systemd-unit-environment-file

Gbp-Pq: Name debian-systemd-unit-environment-file.patch

diff --git a/engine/contrib/init/systemd/docker.service b/engine/contrib/init/systemd/docker.service
index dd285b91895c976bf5e669a7b6483db278182fae..0d7b447201ea5978cf14aa67d7cfb5d4cfc01961 100644 (file)
--- a/engine/contrib/init/systemd/docker.service
+++ b/engine/contrib/init/systemd/docker.service
@@ -10,7 +10,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/dockerd -H fd://
+EnvironmentFile=-/etc/default/docker
+ExecStart=/usr/bin/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