From 1db6f137d93b59409fedb3deb24c876649e1b8f2 Mon Sep 17 00:00:00 2001
From: "Jakob L. Kreuze" <zerodaysfordays@sdf.lonestar.org>
Date: Wed, 31 Jul 2019 14:13:01 -0400
Subject: [PATCH] reconfigure: Reload all shepherd files when upgrading
 services.

Fixes <https://bugs.gnu.org/36878>.
Reported by Robert Vollmert <rob@vllmrt.net>.

* guix/scripts/system/reconfigure.scm (upgrade-shepherd-services): Load
all service files, rather than just those of services to be started.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
 guix/scripts/system/reconfigure.scm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm
index 8c7d461585..dee0c24bd2 100644
--- a/guix/scripts/system/reconfigure.scm
+++ b/guix/scripts/system/reconfigure.scm
@@ -161,12 +161,7 @@ services as defined by OS."
                                              target-services)
                                         (map live-service-canonical-name
                                              live-services)))
-             (service-files
-              (map shepherd-service-file
-                   (filter (lambda (service)
-                             (memq (shepherd-service-canonical-name service)
-                                   to-start))
-                           target-services))))
+             (service-files (map shepherd-service-file target-services)))
         (eval #~(primitive-load #$(upgrade-services-program service-files
                                                             to-start
                                                             to-unload