From bb103db53a0188497ae5e10a19acd59451c6645e Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 3 Apr 2010 13:26:09 +0200
Subject: [PATCH] Let the vidalia package override some of our init script
 settings.

People who have vidalia installed might not want to run Tor as a system
service. The vidalia .deb can ask them that and then set run-daemon
to no.
(cherry picked from commit 03b45a6fe648b751fdde5439be8a8a37ed187e5b)
---
 debian/tor.default | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/tor.default b/debian/tor.default
index c0fdc72de5..48127cc841 100644
--- a/debian/tor.default
+++ b/debian/tor.default
@@ -37,3 +37,10 @@ RUN_DAEMON="yes"
 # Comment this out if you do not want to get coredumps
 #
 ulimit -c unlimited
+
+# Let the vidalia package override some of our settings.
+# People who have vidalia installed might not want to run Tor as a system
+# service. The vidalia .deb can ask them that and then set run-daemon to no.
+if [ -e /etc/default/tor.vidalia ] && [ -x /usr/bin/vidalia ]; then
+	. /etc/default/tor.vidalia
+fi
-- 
GitLab