[or-cvs] r16035: Stop requiring that the binary in /usr/sbin/tor is still the (tor/branches/tor-0_2_0-patches/debian)

[weasel at seul.org]

Author: weasel
Date: 2008-07-17 19:48:39 -0400 (Thu, 17 Jul 2008)
New Revision: 16035

Modified:
   tor/branches/tor-0_2_0-patches/debian/changelog
   tor/branches/tor-0_2_0-patches/debian/tor.init
Log:
Stop requiring that the binary in /usr/sbin/tor is still the same as the one
that actually is the running tor when we try to stop or reload the daemon using
the init script.  If the process is called tor, running as debian-tor, and the
pid file agrees to then it probably is the Tor you want to stop (closes:
#491246).


Modified: tor/branches/tor-0_2_0-patches/debian/changelog
===================================================================
--- tor/branches/tor-0_2_0-patches/debian/changelog	2008-07-17 23:26:40 UTC (rev 16034)
+++ tor/branches/tor-0_2_0-patches/debian/changelog	2008-07-17 23:48:39 UTC (rev 16035)
@@ -1,3 +1,13 @@
+tor (0.2.0.30-2) unstable; urgency=low
+
+  * Stop requiring that the binary in /usr/sbin/tor is still the same as the
+    one that actually is the running tor when we try to stop or reload the
+    daemon using the init script.  If the process is called tor, running as
+    debian-tor, and the pid file agrees to then it probably is the Tor you
+    want to stop (closes: #491246).
+
+ -- Peter Palfrader <weasel at debian.org>  Fri, 18 Jul 2008 01:46:26 +0200
+
 tor (0.2.0.30-1) unstable; urgency=low
 
   * New upstream version.

Modified: tor/branches/tor-0_2_0-patches/debian/tor.init
===================================================================
--- tor/branches/tor-0_2_0-patches/debian/tor.init	2008-07-17 23:26:40 UTC (rev 16034)
+++ tor/branches/tor-0_2_0-patches/debian/tor.init	2008-07-17 23:48:39 UTC (rev 16035)
@@ -22,6 +22,8 @@
 DESC="tor daemon"
 TORPIDDIR=/var/run/tor
 TORPID=$TORPIDDIR/tor.pid
+DAEMON_USER=debian-tor
+DAEMON_NAME=tor
 DEFAULTSFILE=/etc/default/$NAME
 WAITFORDAEMON=60
 ARGS=""
@@ -144,12 +146,12 @@
 		exit 0
 	fi
 
-	if start-stop-daemon --stop --signal INT --quiet --pidfile $TORPID --exec $DAEMON; then
+	if start-stop-daemon --stop --signal INT --quiet --pidfile $TORPID --name $DAEMON_NAME --user $DAEMON_USER; then
 		wait_for_deaddaemon $pid
 		echo "$NAME."
 	elif kill -0 $pid 2>/dev/null
 	then
-		echo "FAILED (Is $pid not $NAME?  Is $DAEMON a different binary now?)."
+		echo "FAILED (Is $pid not $NAME?)."
 	else
 		echo "FAILED ($DAEMON died: process $pid not running; or permission denied)."
 	fi
@@ -165,12 +167,12 @@
 
 	check_config
 
-	if start-stop-daemon --stop --signal 1 --quiet --pidfile $TORPID --exec $DAEMON
+	if start-stop-daemon --stop --signal 1 --quiet --pidfile $TORPID --name $DAEMON_NAME --user $DAEMON_USER
 	then
 		echo "$NAME."
 	elif kill -0 $pid 2>/dev/null
 	then
-		echo "FAILED (Is $pid not $NAME?  Is $DAEMON a different binary now?)."
+		echo "FAILED (Is $pid not $NAME?)."
 	else
 		echo "FAILED ($DAEMON died: process $pid not running; or permission denied)."
 	fi