From 7fd62cf7c40f4a04e9fabbcdbd19323fd99030cf Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 14 Dec 2009 16:02:15 +0000
Subject: [PATCH] Monotone-Parent: 6140aebb346323f84af35a4ebdf8250e6532d39e
 Monotone-Revision: 107bfcafb94e725ae14c9e2bceacbf8399ae6958

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-12-14T16:02:15
Monotone-Branch: ca.inverse.sogo
---
 Scripts/sogo-init.d-redhat | 32 ++++----------------------------
 Scripts/sogo-init.d-sles   |  2 +-
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/Scripts/sogo-init.d-redhat b/Scripts/sogo-init.d-redhat
index db3f5600c..d17cbebb7 100755
--- a/Scripts/sogo-init.d-redhat
+++ b/Scripts/sogo-init.d-redhat
@@ -97,27 +97,14 @@ start() {
 
 stop() {
     echo $"Stopping $DESC: "
-    # We kill the parent processes with SIGTERM so that they
-    # can exit gracefully.
     pid="`cat $PIDFILE 2> /dev/null`"
     if [ -n "$pid" ]
     then
         pid="`ps --pid ${pid} -o pid=`"
 	if [ -n "$pid" ]
 	then
-	    if kill $pid >& /dev/null
-	    then
-                sleep 1
-                pid="`ps --pid ${pid} -o pid=`"
-	        if [ -n "$pid" ]
-	        then
-		    echo "  $NAME stopped"
-                else
-		    kill -9 $pid >& /dev/null
-		    echo "  $NAME killed"
-                fi
-	        rm -f $PIDFILE
-	    fi
+	    kill $pid >& /dev/null
+	    echo "  $NAME stopped"
 	else
 	    echo "  $NAME not running"
 	fi
@@ -131,20 +118,9 @@ restart() {
     pid="`cat $PIDFILE 2> /dev/null`"
     if [ -n "$pid" ]
     then
-        pid="`ps --pid ${pid} -o pid=`"
-	if [ -n "$pid" ]
-	then
-	    if kill $pid >& /dev/null
-	    then
-                sleep 1
-                pid="`ps --pid ${pid} -o pid=`"
-	        if [ -n "$pid" ]
-	        then
-		    kill -9 $pid >& /dev/null
-                fi
-	    fi
-	fi
+	kill $pid >& /dev/null
     fi
+    sleep 1
     daemon --user="$USER" --pidfile="$PIDFILE" "$DAEMON" $DAEMON_OPTS
     echo "  $NAME"
 }
diff --git a/Scripts/sogo-init.d-sles b/Scripts/sogo-init.d-sles
index 0c053e792..a7808a89d 100755
--- a/Scripts/sogo-init.d-sles
+++ b/Scripts/sogo-init.d-sles
@@ -92,7 +92,7 @@ case "$1" in
   restart)
 	echo -n "Restarting $DESC: "
 	killproc -p $PIDFILE $DAEMON || true
-	sleep 1
+        sleep 1
 	startproc -u $USER $DAEMON $DAEMON_OPTS || true
 	echo "$NAME."
 	;;