[shepherd] branch master updated: service: systemd: Use correct format for LISTEN_FDNAMES.

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch master
in repository shepherd.

The following commit(s) were added to refs/heads/master by this push:
     new 74817c4  service: systemd: Use correct format for LISTEN_FDNAMES.
74817c4 is described below

commit 74817c475b4d66923df89802e50666257dc82a68
Author: Bastien Riviere <me@babariviere.com>
AuthorDate: Sat May 7 01:08:28 2022 +0200

    service: systemd: Use correct format for LISTEN_FDNAMES.
    
    As in the documentation, LISTEN_FDNAMES is expected to be a
    "colon-separated list of names".  This patch adds the missing delimiter
    when joining to LISTEN_FDNAMES.
    
    This fixes issues with services, like gpg-agent, which produces this
    kind of error:
    
    > [gpg-agent] Fatal: number of items in LISTEN_FDNAMES (1) does not match 
LISTEN_FDS (4) in --supervised mode
    
    * modules/shepherd/service.scm (make-systemd-constructor): Pass second
    argument to 'string-join' when constructing LISTEN_FDNAMES value.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 modules/shepherd/service.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/shepherd/service.scm b/modules/shepherd/service.scm
index 81bd667..f343938 100644
--- a/modules/shepherd/service.scm
+++ b/modules/shepherd/service.scm
@@ -352,7 +352,7 @@ wire."
 (define-method (running? (obj <service>))
   (and (service-running-value obj) #t))
 
-;; Return a list of all actions implemented by OBJ. 
+;; Return a list of all actions implemented by OBJ.
 (define-method (action-list (obj <service>))
   (map action-name (slot-ref obj 'actions)))
 
@@ -1594,7 +1594,8 @@ This must be paired with @code{make-systemd-destructor}."
                                            (number->string (length sockets)))
                             (string-append "LISTEN_FDNAMES="
                                            (string-join
-                                            (map endpoint-name endpoints)))))
+                                            (map endpoint-name endpoints)
+                                            ":"))))
            (running   sockets))
       (spawn-fiber
        (lambda ()