From: Wilfried Göesgens <willi@citadel.org>
Date: Sun, 27 Jan 2008 00:07:06 +0000 (+0000)
Subject: * try to watch the PID for shutting down citserver
X-Git-Tag: v7.86~2552
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=5cb73bf9adee22f68acc4d884982c9d81a5393a4

* try to watch the PID for shutting down citserver
---

diff --git a/citadel/debian/citadel.init b/citadel/debian/citadel.init
index 918695ac9..6d27f0301 100644
--- a/citadel/debian/citadel.init
+++ b/citadel/debian/citadel.init
@@ -73,17 +73,18 @@ do_stop()
 	#   2 if daemon could not be stopped
 	#   other if a failure occurred
         if $SENDCOMMAND "DOWN" >/dev/null 2>&1 ; then
+	    PID=`cat $PIDFILE`
 	    rm -f $PIDFILE
 	    count=0;
-	    while test -S /var/run/citadel/citadel.socket; do 
+	    while test -S /var/run/citadel/citadel.socket -o -d /proc/$PID; do 
 		count=$(($count+1))
 		sleep 1
 		echo -n "."
 		if test "$count" = "10"; then
-		    killall citserver
+		    kill $PID
 		fi
 		if test "$count" = "20"; then
-		    killall -9 citserver
+		    kill -9 $PID
 		    rm -rf /var/run/citadel/*
 		fi
 	    done