summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2014-02-07 07:59:03 +0000
committerLars Wendler <polynomial-c@gentoo.org>2014-02-07 07:59:03 +0000
commitc1d2646d542a562aeef4189ddd3996bf91bfb76a (patch)
treecf7730844509a171d02cbbfb0d9b1f3dc106cb16 /dev-vcs/git/files
parentForce configure to always detect bash as /bin/bash. Drop unused flex dep and... (diff)
downloadgentoo-2-c1d2646d542a562aeef4189ddd3996bf91bfb76a.tar.gz
gentoo-2-c1d2646d542a562aeef4189ddd3996bf91bfb76a.tar.bz2
gentoo-2-c1d2646d542a562aeef4189ddd3996bf91bfb76a.zip
Attempt to fix startup of git-daemon as non-root user (bug #460370). Added sys-devel/gettext to DEPEND when nls USE flag is enabled
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'dev-vcs/git/files')
-rw-r--r--dev-vcs/git/files/git-daemon-r1.initd6
1 files changed, 3 insertions, 3 deletions
diff --git a/dev-vcs/git/files/git-daemon-r1.initd b/dev-vcs/git/files/git-daemon-r1.initd
index 2bc4af71b324..339b6238bac4 100644
--- a/dev-vcs/git/files/git-daemon-r1.initd
+++ b/dev-vcs/git/files/git-daemon-r1.initd
@@ -1,12 +1,12 @@
#!/sbin/runscript
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon-r1.initd,v 1.1 2014/02/04 09:36:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon-r1.initd,v 1.2 2014/02/07 07:59:03 polynomial-c Exp $
pidfile="/run/git-daemon.pid"
command="/usr/bin/git"
-command_args="daemon --pid-file=${pidfile} --user=${GIT_USER} --group=${GIT_GROUP} ${GITDAEMON_OPTS}"
-start_stop_daemon_args="-b -p ${pidfile}"
+command_args="daemon ${GITDAEMON_OPTS}"
+start_stop_daemon_args="-b -m -p ${pidfile} -u ${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"
depend() {
use logger