commit:     e3d1d95bd9a6935fddfb0f4253d784c1b72564d3
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 22:47:28 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May  8 22:47:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d1d95b

Revert "dev-vcs/git: for systemd, don't source /etc/conf.d/git-daemon"

This reverts commit 843954e66426a8e87c42a2c3d3d99ca6fa7d4744.

 dev-vcs/git/files/git-daemon_at.service | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-vcs/git/files/git-daemon_at.service 
b/dev-vcs/git/files/git-daemon_at.service
index 0a1bd14..2a080d4 100644
--- a/dev-vcs/git/files/git-daemon_at.service
+++ b/dev-vcs/git/files/git-daemon_at.service
@@ -5,8 +5,9 @@ Documentation=man:git-daemon(1)
 [Service]
 User=nobody
 Group=nobody
+EnvironmentFile=/etc/conf.d/git-daemon
 # Ignore non-zero exit status, access error makes git-daemon return them
-ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git 
--verbose
+ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git 
--verbose $GITDAEMON_OPTS
 StandardInput=socket
 StandardOutput=inherit
 StandardError=journal

Reply via email to