fix module import for shepherd service

2 files changed, 22 insertions, 14 deletions

diff --git a/guix/config.scm b/guix/config.scm
index 481ab10..5e99709 100644
--- a/guix/config.scm
+++ b/guix/config.scm
@@ -27,7 +27,7 @@
  (guix utils)
  (guix gexp)
  (guix records)
- ((gnu packages admin) #:select (shadow))
+ ((gnu packages admin) #:select (shadow shepherd))
  (taler-helpers))
 
 (use-system-modules nss)
@@ -89,16 +89,19 @@
          (provision '(fcgiwrap))
          (documentation "Run the fcgiwrap daemon.")
          (requirement '(networking))
-         (start (with-imported-modules
-                 `(((shepherd-with-sock) => ,(local-file "shepherd-with-sock.scm")))
-                 #~(begin
-                     (use-modules ((shepherd-with-sock) #:prefix my:))
-                     (my:make-forkexec-constructor
-                      '(#$(file-append package "/sbin/fcgiwrap"))
-                      #:user #$user
-                      #:group #$group
-                      #:stdin-socket #$parsed-socket))))
-         (stop #~(make-kill-destructor))))))))
+         (start (with-extensions
+                 (list shepherd)
+                 (with-imported-modules
+                  `(((shepherd-with-sock) => ,(local-file "shepherd-with-sock.scm"))
+                    ,@(source-module-closure '((shepherd service))))
+                  #~(begin
+                      (use-modules ((shepherd-with-sock) #:prefix my:))
+                      (my:make-forkexec-constructor
+                       '(#$(file-append package "/sbin/fcgiwrap"))
+                       #:user #$user
+                       #:group #$group
+                       #:stdin-socket '#$parsed-socket)))))
+                (stop #~(make-kill-destructor))))))))
 
 
 (define my-fcgiwrap-accounts
diff --git a/guix/shepherd-with-sock.scm b/guix/shepherd-with-sock.scm
index 2667b8c..cd4138d 100644
--- a/guix/shepherd-with-sock.scm
+++ b/guix/shepherd-with-sock.scm
@@ -1,4 +1,7 @@
 (define-module (shepherd-with-sock)
+  #:use-module ((shepherd service)
+                #:select (handle-SIGCHLD
+                          catch-system-error))
   #:export (make-forkexec-constructor))
 
 
@@ -126,6 +129,10 @@ false."
                  program (strerror (system-error-errno args)))
          (primitive-exit 1)))))
 
+(define (ensure-sigchld-handler)
+  (unless (@@ (shepherd service) %sigchld-handler-installed?)
+    (sigaction SIGCHLD handle-SIGCHLD SA_NOCLDSTOP)
+    (set! (@@ (shepherd service) %sigchld-handler-installed?) #t)))
 
 (define* (fork+exec-command command
                             #:key
@@ -138,10 +145,8 @@ false."
                             (stdin-socket #f))
   "Spawn a process that executed COMMAND as per 'exec-command', and return
 its PID."
+  (ensure-sigchld-handler)
   ;; Install the SIGCHLD handler if this is the first fork+exec-command call
-  (unless %sigchld-handler-installed?
-    (sigaction SIGCHLD handle-SIGCHLD SA_NOCLDSTOP)
-    (set! %sigchld-handler-installed? #t))
   (let ((pid (primitive-fork)))
     (if (zero? pid)
         (exec-command command