torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	contrib/dist/tor.service.in
This commit is contained in:
Nick Mathewson
2014-07-30 14:00:21 -04:00
parent 88590ed3a6 8b470ee4b5
commit 74a8555d2b
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug12731-systemd-no-run-as-daemon
+9
View File
@@ -0,0 +1,9 @@
o Distribution:
- Explicitly disable RunAsDaemon in the systemd unit file.
Our current systemd unit uses "Type = simple", so systemd does
not expect tor to fork. If the user has "RunAsDaemon 1" in their
torrc, then things won't work as expected. This is e.g. the case
on Debian (and derivatives), since there we pass
"--defaults-torrc /usr/share/tor/tor-service-defaults-torrc"
(that contains "RunAsDaemon 1") by default.
Patch by intrigeri; resolves ticket 12731.