GNU bug report logs - #65119
[PATCH 0/8] Sharing service code between Home and System

Previous Next

Full log

Message #8 received at 65119 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: 65119 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludo <at> gnu.org>
Subject: [PATCH 1/8] services: dicod: Remove Shepherd < 0.9.0 compatibility
 layer.
Date: Sun,  6 Aug 2023 23:07:28 +0200

* gnu/services/dict.scm (dicod-shepherd-service): Use
'make-inetd-constructor' and 'make-inetd-destructor' unconditionally.
---
 gnu/services/dict.scm | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/gnu/services/dict.scm b/gnu/services/dict.scm
index 23e1d36364..7d48953ef1 100644
--- a/gnu/services/dict.scm
+++ b/gnu/services/dict.scm
@@ -167,25 +167,18 @@ (define (dicod-shepherd-service config)
            (provision '(dicod))
            (requirement '(user-processes))
            (documentation "Run the dicod daemon.")
-           (start #~(if (defined? 'make-inetd-constructor)
-                        (make-inetd-constructor
-                         (list #$dicod "--inetd" "--foreground"
-                               (string-append "--config=" #$dicod.conf))
-                         (map (lambda (interface)
-                                (endpoint
-                                 (addrinfo:addr
-                                  (car (getaddrinfo interface "dict")))))
-                              '#$interfaces)
-                         #:requirements '#$requirement
-                         #:user "dicod" #:group "dicod"
-                         #:service-name-stem "dicod")
-                        (make-forkexec-constructor
-                         (list #$dicod "--foreground"
-                               (string-append "--config=" #$dicod.conf))
-                         #:user "dicod" #:group "dicod")))
-           (stop #~(if (defined? 'make-inetd-destructor)
-                       (make-inetd-destructor)
-                       (make-kill-destructor)))
+           (start #~(make-inetd-constructor
+                     (list #$dicod "--inetd" "--foreground"
+                           (string-append "--config=" #$dicod.conf))
+                     (map (lambda (interface)
+                            (endpoint
+                             (addrinfo:addr
+                              (car (getaddrinfo interface "dict")))))
+                          '#$interfaces)
+                     #:requirements '#$requirement
+                     #:user "dicod" #:group "dicod"
+                     #:service-name-stem "dicod"))
+           (stop #~(make-inetd-destructor))
            (actions (list (shepherd-configuration-action dicod.conf)))))))
 
 (define dicod-service-type
-- 
2.41.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.