From 69e5e8d0adc7d841c1b5c2d24f2c8228563cc66f Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 4 Nov 2004 15:17:22 +0000
Subject: Merge RPM spec patch from jbash

svn:r2674
---
 contrib/tor.sh.in | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'contrib/tor.sh.in')

diff --git a/contrib/tor.sh.in b/contrib/tor.sh.in
index dfde1f6a4..c5d79b88c 100644
--- a/contrib/tor.sh.in
+++ b/contrib/tor.sh.in
@@ -10,10 +10,12 @@ TORGROUP=
 TORBIN=@BINDIR@/tor
 TORPID=@LOCALSTATEDIR@/run/tor/tor.pid
 TORLOG=@LOCALSTATEDIR@/log/tor/tor.log
+TORDATA=@LOCALSTATEDIR@/lib/tor
+
 TORCONF=@CONFDIR@/torrc
 # Strictly speaking, we don't need to su if we have --user and --group.
 # "Belt and suspenders," says jbash.
-TORARGS="--pidfile $TORPID --logfile $TORLOG --runasdaemon 1"
+TORARGS="--pidfile $TORPID --logfile $TORLOG --runasdaemon 1 --datadirectory $TORDATA"
 if [ "x$TORUSER" != "x" ]; then
     TORARGS="$TORARGS --user $TORUSER"
 fi
@@ -56,8 +58,8 @@ case "$1" in
             echo " ERROR!"
         fi
     else
-        echo "Unable to kill tor: $TORPID does not exist"
-        RETVAL=1
+        echo "Unable to kill tor: $TORPID does not exist. Assuming already dead."
+        RETVAL=0
     fi
     ;;
 
-- 
cgit v1.2.3