diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-07-30 14:00:21 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-07-30 14:00:21 -0400 |
| commit | 74a8555d2be2ce9d33e9814212e5de49ba089274 (patch) | |
| tree | 89672a970dab21b763886080d4c78cb3988dd6ac /contrib/dist | |
| parent | 88590ed3a66423fd4de3ad10dc67f1c9b18bf047 (diff) | |
| parent | 8b470ee4b54582b599debf5ab5b996eb06525093 (diff) | |
| download | tor-74a8555d2be2ce9d33e9814212e5de49ba089274.tar.gz tor-74a8555d2be2ce9d33e9814212e5de49ba089274.zip | |
Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint-0.2.5
Conflicts:
contrib/dist/tor.service.in
Diffstat (limited to 'contrib/dist')
| -rw-r--r-- | contrib/dist/tor.service.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in index 9914a78895..2fe51c75d9 100644 --- a/contrib/dist/tor.service.in +++ b/contrib/dist/tor.service.in @@ -5,7 +5,9 @@ After = syslog.target network.target nss-lookup.target [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 |