From: Mike Gilbert Date: Sun, 8 May 2016 22:47:28 +0000 (-0400) Subject: Revert "dev-vcs/git: for systemd, don't source /etc/conf.d/git-daemon" X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e3d1d95bd9a6935fddfb0f4253d784c1b72564d3;p=gentoo.git Revert "dev-vcs/git: for systemd, don't source /etc/conf.d/git-daemon" This reverts commit 843954e66426a8e87c42a2c3d3d99ca6fa7d4744. --- diff --git a/dev-vcs/git/files/git-daemon_at.service b/dev-vcs/git/files/git-daemon_at.service index 0a1bd14b16a3..2a080d4e7d8f 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