From 9b15bfad5189780b0155d614fb1cbe48999315f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 19 Oct 2025 11:30:52 +0200
Subject: [PATCH] =?UTF-8?q?services:=20herd:=20Remove=20=E2=80=98load-serv?=
 =?UTF-8?q?ices/safe=E2=80=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 gnu/services/herd.scm               | 6 ------
 guix/scripts/system/reconfigure.scm | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/gnu/services/herd.scm b/gnu/services/herd.scm
index 46fbe1fc983503d6c3683d5b674cf5e6e699c771..d276ba1b74cad49954bd1cd004a5116b64450df2 100644
--- a/gnu/services/herd.scm
+++ b/gnu/services/herd.scm
@@ -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)
diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm
index bb82f1b3e586a80a6740fc15fb0661a5c0e0f755..8c63921e638e7e7c4e570fae0cb7fab67a1b45c8 100644
--- a/guix/scripts/system/reconfigure.scm
+++ b/guix/scripts/system/reconfigure.scm
@@ -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)