From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 21 Jul 2019 15:11:59 +0000 (+0200)
Subject: Don't override SSH_AUTH_SOCK in the example emacs.service file
X-Git-Tag: emacs-27.0.90~1829
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ca08815943a1314c154742b9ae3e36ca47aed3b8;p=emacs.git

Don't override SSH_AUTH_SOCK in the example emacs.service file

* etc/emacs.service (ExecStop): Don't override SSH_AUTH_SOCK by
default, because it varies by distribution where the socket is
(bug#27620).
---

diff --git a/etc/emacs.service b/etc/emacs.service
index dbcb6bc301e..c99c6779f58 100644
--- a/etc/emacs.service
+++ b/etc/emacs.service
@@ -10,7 +10,9 @@ Documentation=info:emacs man:emacs(1) https://gnu.org/software/emacs/
 Type=notify
 ExecStart=emacs --fg-daemon
 ExecStop=emacsclient --eval "(kill-emacs)"
-Environment=SSH_AUTH_SOCK=%t/keyring/ssh
+# The location of the SSH auth socket varies by distribution, and some
+# set it from PAM, so don't override by default.
+# Environment=SSH_AUTH_SOCK=%t/keyring/ssh
 Restart=on-failure
 
 [Install]