[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4666fe7dfe394cc16388b17fa4dedc921cc98fbe)

Vlad Glagolev scm at sourcemage.org
Thu Aug 21 02:52:21 EDT 2008


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 devel/git/HISTORY           |    4 +++-
 devel/git/init.d/git-daemon |   14 +++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 4666fe7dfe394cc16388b17fa4dedc921cc98fbe
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    git: fixed running/stopping process for git-daemon

diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 4b0ef6b..fc95d4d 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,5 +1,7 @@
 2008-08-21 Vlad Glagolev <stealth at sourcemage.org>
-	* init.d/git-daemon: use the multicall git binary (since 1.6)
+	* DETAILS: updated spell to 1.6.0
+	* init.d/git-daemon: use the multicall git binary (since 1.6); fixed
+	  running/stopping process, cleaned up
 
 2008-08-18 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.6.0, added some more bashism
diff --git a/devel/git/init.d/git-daemon b/devel/git/init.d/git-daemon
index bd238aa..c43b45a 100755
--- a/devel/git/init.d/git-daemon
+++ b/devel/git/init.d/git-daemon
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+PIDFILE=/var/run/git.pid
 PROGRAM=/usr/bin/git
 RUNLEVEL=3
 NEEDS="+network"
@@ -9,7 +10,7 @@ NEEDS="+network"
 
 create_args()
 {
-	ARGS="daemon $EXTRA_ARGS"
+	ARGS="daemon --pid-file=/var/run/git.pid $EXTRA_ARGS"
 	[[ $TIMEOUT ]] && ARGS="$ARGS --timeout=$TIMEOUT"
 	[[ $INIT_TIMEOUT ]] && ARGS="$ARGS --init-timeout=$INIT_TIMEOUT"
 	[[ $PORT ]] && ARGS="$ARGS --port=$PORT"
@@ -31,7 +32,14 @@ start()
 	create_args
 	(
 		unset -f echo &&
-		su -c "$PROGRAM $ARGS >> ${LOG_FILE} 2>&1" $USER
-	) &
+		su $USER -c "$PROGRAM $ARGS >> $LOG_FILE 2>&1 &"
+	)
+	evaluate_retval
+}
+
+stop()
+{
+	echo "Shutting down Git Daemon:"
+	killproc git-daemon
 	evaluate_retval
 }



More information about the SM-Commit mailing list