diff mbox series

[bug#68258,6/7] home: services: shepherd: Use the 0.10.x interface.

Message ID a0f186a8cc5662b4233d072927cf874ec12ee636.1704451578.git.ludo@gnu.org
State New
Headers show
Series Upgrading Shepherd and moving the Hurd to 0.10.x | expand

Commit Message

Ludovic Courtès Jan. 5, 2024, 10:59 a.m. UTC 
* gnu/home/services/shepherd.scm (home-shepherd-configuration-file):
Pass ‘register-services’ a list.  Call ‘start-in-the-background’
unconditionally.

Change-Id: Id7ba005949653a9ac065c47eddb425df4f4792aa
---
 gnu/home/services/shepherd.scm | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/gnu/home/services/shepherd.scm b/gnu/home/services/shepherd.scm
index bd068c37fc..176f4575cb 100644
--- a/gnu/home/services/shepherd.scm
+++ b/gnu/home/services/shepherd.scm
@@ -1,6 +1,7 @@ 
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2021, 2023 Andrew Tropin <andrew@trop.in>
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
+;;; Copyright © 2024 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -75,11 +76,8 @@  (define (home-shepherd-configuration-file config)
       #~(begin
           (use-modules (srfi srfi-34)
                        (system repl error-handling))
-          (apply
-           register-services
-           (map
-            (lambda (file) (load file))
-            '#$files))
+
+          (register-services (map load '#$files))
 
           #$@(if daemonize?
                  `((action 'root 'daemonize))
@@ -90,9 +88,7 @@  (define (home-shepherd-configuration-file config)
                  '#$(append-map shepherd-service-provision
                                 (filter shepherd-service-auto-start?
                                         services))))
-            (if (defined? 'start-in-the-background)
-                (start-in-the-background services-to-start)
-                (for-each start services-to-start))
+            (start-in-the-background services-to-start)
 
             (redirect-port (open-input-file "/dev/null")
                            (current-input-port)))))