From b820d3bc425e6a7d0b7b5adaa3c4b2541183feb4 Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Wed, 19 Nov 2003 22:48:07 +0000
Subject: [PATCH] define the pidfile on the commandline, if you want it

svn:r854
---
 tor.sh.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tor.sh.in b/tor.sh.in
index b47d82ae87..ecf3cb32d8 100644
--- a/tor.sh.in
+++ b/tor.sh.in
@@ -4,7 +4,7 @@ TORBIN=@BINDIR@/tor
 TORPID=@LOCALSTATEDIR@/run/tor.pid
 TORLOG=@LOCALSTATEDIR@/log/tor/tor.log
 TORCONF=@CONFDIR@/torrc
-TORARGS="-l warn"
+TORARGS="--pidfile $TORPID --logfile $TORLOG --runasdaemon 1"
 RETVAL=0
 
 case "$1" in
@@ -16,7 +16,7 @@ case "$1" in
         RETVAL=1
     else 
         echo -n "Starting tor..."
-        $TORBIN -f $TORCONF $TORARGS >$TORLOG 2>&1 &
+        $TORBIN -f $TORCONF $TORARGS
         RETVAL=$?
         if [ $RETVAL -eq 0 ]; then
             echo " ok"