From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44600) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dL342-00012X-Qq for guix-patches@gnu.org; Wed, 14 Jun 2017 03:50:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dL33z-0007XV-2m for guix-patches@gnu.org; Wed, 14 Jun 2017 03:50:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:43965) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dL33y-0007XR-Vx for guix-patches@gnu.org; Wed, 14 Jun 2017 03:50:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dL33y-0006Zs-Ns for guix-patches@gnu.org; Wed, 14 Jun 2017 03:50:02 -0400 Subject: [bug#27323] [PATCH v2 shepherd 1/2] Use XDG_RUNTIME_DIR for the shepherd socket. Resent-Message-ID: From: Danny Milosavljevic Date: Wed, 14 Jun 2017 09:49:01 +0200 Message-Id: <20170614074902.1130-2-dannym@scratchpost.org> In-Reply-To: <20170614074902.1130-1-dannym@scratchpost.org> References: <20170611023650.6928-1-dannym@scratchpost.org> <20170614074902.1130-1-dannym@scratchpost.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 27323@debbugs.gnu.org --- modules/shepherd/support.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/shepherd/support.scm b/modules/shepherd/support.scm index e50de74..ea98b5f 100644 --- a/modules/shepherd/support.scm +++ b/modules/shepherd/support.scm @@ -251,6 +251,11 @@ There is NO WARRANTY, to the extent permitted by law."))) (string-append user-homedir "/.config")) "/shepherd")) +(define %user-runtime-dir + ;; Default runtime directory if shepherd is run as a normal user. + (string-append (or (getenv "XDG_RUNTIME_DIR") + (format #f "/run/user/~s" (getuid))))) + (define (make-bare-init-file target) "Return #t if a bare init file was created at TARGET; #f otherwise. @@ -301,7 +306,7 @@ create a template configuration file if non exists." (define default-socket-dir (if (zero? (getuid)) %system-socket-dir - (string-append %user-config-dir "/run"))) + (string-append %user-runtime-dir "/shepherd"))) ;; Unix domain socket for receiving commands in shepherd. (define default-socket-file