From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 30 Jul 2014 18:00:21 +0000 (-0400)
Subject: Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint... 
X-Git-Tag: tor-0.2.6.1-alpha~213^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74a8555d2be2ce9d33e9814212e5de49ba089274;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint-0.2.5

Conflicts:
	contrib/dist/tor.service.in
---

74a8555d2be2ce9d33e9814212e5de49ba089274
diff --cc contrib/dist/tor.service.in
index 9914a78895,1d52f622fa..2fe51c75d9
--- a/contrib/dist/tor.service.in
+++ b/contrib/dist/tor.service.in
@@@ -4,8 -4,9 +4,10 @@@ After = syslog.target network.target ns
  
  [Service]
  Type = simple
 +ExecStartPre = @BINDIR@/tor -f @CONFDIR@/torrc --verify-config
- ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc
+ # A torrc that has "RunAsDaemon 1" won't work with the "simple" service type;
+ # let's explicitly override it.
+ ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc --RunAsDaemon 0
  ExecReload = /bin/kill -HUP ${MAINPID}
  KillSignal = SIGINT
  TimeoutSec = 30