commit 74a8555d2be2ce9d33e9814212e5de49ba089274 Merge: 88590ed 8b470ee Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jul 30 14:00:21 2014 -0400 Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint-0.2.5 Conflicts: contrib/dist/tor.service.in changes/bug12731-systemd-no-run-as-daemon | 9 +++++++++ contrib/dist/tor.service.in | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --cc contrib/dist/tor.service.in index 9914a78,1d52f62..2fe51c7 --- 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