[gentoo-commits] gentoo-x86 commit in dev-vcs/git/files: git-daemon-r1.initd

[Lars Wendler (polynomial-c)]

polynomial-c    14/02/07 07:59:03

  Modified:             git-daemon-r1.initd
  Log:
  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)

Revision  Changes    Path
1.2                  dev-vcs/git/files/git-daemon-r1.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/files/git-daemon-r1.initd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/files/git-daemon-r1.initd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git/files/git-daemon-r1.initd?r1=1.1&r2=1.2

Index: git-daemon-r1.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon-r1.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git-daemon-r1.initd	4 Feb 2014 09:36:35 -0000	1.1
+++ git-daemon-r1.initd	7 Feb 2014 07:59:03 -0000	1.2
@@ -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