guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: services: opendht: Fix hang at boot.


From: guix-commits
Subject: branch master updated: services: opendht: Fix hang at boot.
Date: Wed, 19 May 2021 22:51:20 -0400

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

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new a09cdf1  services: opendht: Fix hang at boot.
a09cdf1 is described below

commit a09cdf1f9d25abd1b3910409787a58386ebc21e2
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed May 19 22:27:25 2021 -0400

    services: opendht: Fix hang at boot.
    
    Fixes <https://issues.guix.gnu.org/48521>.
    
    The problem was caused by the 'file-system-mapping' record not being in 
scope.
    
    * gnu/services/networking.scm (opendht-shepherd-service): Import the (gnu
    system file-systems) module.
    [requirement]: Depend on networking, to avoid spurious output.
    [modules]: New field.
    [start] <group>: New argument.
---
 gnu/services/networking.scm | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index d713042..b78c8ce 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -839,17 +839,23 @@ CONFIG, an <opendht-configuration> object."
 
 (define (opendht-shepherd-service config)
   "Return a <shepherd-service> running OpenDHT."
-  (shepherd-service
-   (documentation "Run an OpenDHT node.")
-   (provision '(opendht dhtnode dhtproxy))
-   (requirement '(user-processes syslogd))
-   (start #~(make-forkexec-constructor/container
-             (list #$@(opendht-configuration->command-line-arguments config))
-             #:mappings (list (file-system-mapping
-                               (source "/dev/log") ;for syslog
-                               (target source)))
-             #:user "opendht"))
-   (stop #~(make-kill-destructor))))
+  (with-imported-modules (source-module-closure
+                          '((gnu build shepherd)
+                            (gnu system file-systems)))
+    (shepherd-service
+     (documentation "Run an OpenDHT node.")
+     (provision '(opendht dhtnode dhtproxy))
+     (requirement '(networking syslogd))
+     (modules '((gnu build shepherd)
+                (gnu system file-systems)))
+     (start #~(make-forkexec-constructor/container
+               (list #$@(opendht-configuration->command-line-arguments config))
+               #:mappings (list (file-system-mapping
+                                 (source "/dev/log") ;for syslog
+                                 (target source)))
+               #:user "opendht"
+               #:group "opendht"))
+     (stop #~(make-kill-destructor)))))
 
 (define opendht-service-type
   (service-type



reply via email to

[Prev in Thread] Current Thread [Next in Thread]