change-system-unit-env-file
authorPaul Tagliamonte <paultag@debian.org>
Wed, 4 Nov 2015 08:09:02 +0000 (08:09 +0000)
committerTianon Gravi <tianon@debian.org>
Wed, 4 Nov 2015 08:09:02 +0000 (08:09 +0000)
Gbp-Pq: Name change-system-unit-env-file.patch

contrib/init/systemd/docker.service

index f09c2d39564ee5f2613e1f45cfa7de0deb0e5f3d..8370631dc80fd0249dc5d69acfc293ea9d11f090 100644 (file)
@@ -6,7 +6,8 @@ Requires=docker.socket
 
 [Service]
 Type=notify
-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