~ruther/guix-local

9b15bfad5189780b0155d614fb1cbe48999315f6 — Ludovic Courtès 5 months ago 9655845
services: herd: Remove ‘load-services/safe’.

This is a followup to 95731b4ef1991f5b85aa9ec9d4fb97c006bec65d.

* gnu/services/herd.scm (load-services/safe): Remove.
* guix/scripts/system/reconfigure.scm (upgrade-services-program): Use
‘load-services’.

Change-Id: Ie5ab99e69e2d7c1934fddd37794c07e6e07489a3
2 files changed, 1 insertions(+), 7 deletions(-)

M gnu/services/herd.scm
M guix/scripts/system/reconfigure.scm
M gnu/services/herd.scm => gnu/services/herd.scm +0 -6
@@ 58,7 58,6 @@
            unload-services
            unload-service
            load-services
            load-services/safe
            start-service
            stop-service
            restart-service


@@ 301,11 300,6 @@ returns a shepherd <service> object."
                               `(primitive-load ,file))
                             files)))))

(define load-services/safe
  ;; Deprecated.  It used to behave differently before service replacements
  ;; were a thing.
  load-services)

(define* (start-service name #:optional (arguments '()))
  (invoke-action name 'start arguments
                 (lambda (result)

M guix/scripts/system/reconfigure.scm => guix/scripts/system/reconfigure.scm +1 -1
@@ 175,7 175,7 @@ canonical names (symbols)."
        ;; Silence messages coming from shepherd such as "Evaluating
        ;; expression ..." since they are unhelpful.
        (parameterize ((shepherd-message-port (%make-void-port "w")))
          (load-services/safe '#$service-files))
          (load-services '#$service-files))

        ;; Unload obsolete services and start new services.
        (for-each unload-service '#$to-unload)