summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2016-05-08 18:47:28 -0400
committerMike Gilbert <floppym@gentoo.org>2016-05-08 18:47:28 -0400
commite3d1d95bd9a6935fddfb0f4253d784c1b72564d3 (patch)
tree317f293d9ffcc30c28c44a47ef201851249768a4 /dev-vcs/git
parentsys-kernel/git-sources: Linux patch 4.6_rc7 (diff)
downloadgentoo-e3d1d95bd9a6935fddfb0f4253d784c1b72564d3.tar.gz
gentoo-e3d1d95bd9a6935fddfb0f4253d784c1b72564d3.tar.bz2
gentoo-e3d1d95bd9a6935fddfb0f4253d784c1b72564d3.zip
Revert "dev-vcs/git: for systemd, don't source /etc/conf.d/git-daemon"
This reverts commit 843954e66426a8e87c42a2c3d3d99ca6fa7d4744.
Diffstat (limited to 'dev-vcs/git')
-rw-r--r--dev-vcs/git/files/git-daemon_at.service3
1 files changed, 2 insertions, 1 deletions
diff --git a/dev-vcs/git/files/git-daemon_at.service b/dev-vcs/git/files/git-daemon_at.service
index 0a1bd14b16a..2a080d4e7d8 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