[packages/docker.git] / systemd.patch

--- docker-1.12.1/contrib/init/systemd/docker.service	2016-08-30 00:06:51.450800482 +0300
+++ docker-1.12.1/contrib/init/systemd/docker.service	2016-09-26 21:36:55.000000000 +0300
@@ -5,11 +5,12 @@
 Requires=docker.socket
 
 [Service]
+EnvironmentFile=-/etc/sysconfig/docker
 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://
+ExecStart=/usr/sbin/dockerd -H fd:// $OPTIONS
 ExecReload=/bin/kill -s HUP $MAINPID
 # Having non-zero Limit*s causes performance problems due to accounting overhead
 # in the kernel. We recommend using cgroups to do container-local accounting.
Commit	Line	Data
eb90880a ER	1	--- docker-1.12.1/contrib/init/systemd/docker.service 2016-08-30 00:06:51.450800482 +0300
	2	+++ docker-1.12.1/contrib/init/systemd/docker.service 2016-09-26 21:36:55.000000000 +0300
	3	@@ -5,11 +5,12 @@
	4	Requires=docker.socket
	5
	6	[Service]
	7	+EnvironmentFile=-/etc/sysconfig/docker
	8	Type=notify
2a4ee79e ER	9	# the default is not to use systemd for cgroups because the delegate issues still
	10	# exists and systemd currently does not support the cgroup feature set required
	11	# for containers run by docker
	12	-ExecStart=/usr/bin/dockerd -H fd://
eb90880a	13	+ExecStart=/usr/sbin/dockerd -H fd:// $OPTIONS
2a4ee79e ER	14	ExecReload=/bin/kill -s HUP $MAINPID
	15	# Having non-zero Limit*s causes performance problems due to accounting overhead
	16	# in the kernel. We recommend using cgroups to do container-local accounting.