branch master updated: guix system: Adjust 'upgrade-shepherd-services' to shepherd service change.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new ede4a81  guix system: Adjust 'upgrade-shepherd-services' to shepherd 
service change.
ede4a81 is described below

commit ede4a81947f239a52282082bcbc25e6b7c90ced2
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Jan 30 18:21:58 2021 +0100

    guix system: Adjust 'upgrade-shepherd-services' to shepherd service change.
    
    Fixes a regression introduced in 95f72dcd7aece05e9252c93bef5a831f96cb5393.
    
    * guix/scripts/system/reconfigure.scm 
(upgrade-shepherd-services)[target-services]:
    Add call to 'shepherd-configuration-services'.
---
 guix/scripts/system/reconfigure.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/guix/scripts/system/reconfigure.scm 
b/guix/scripts/system/reconfigure.scm
index 5581e12..39a818d 100644
--- a/guix/scripts/system/reconfigure.scm
+++ b/guix/scripts/system/reconfigure.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès 
<ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès 
<ludo@gnu.org>
 ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2016, 2017, 2018 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -177,9 +177,10 @@ canonical names (symbols)."
 upgrade the Shepherd (PID 1) by unloading obsolete services and loading new
 services as defined by OS."
   (define target-services
-    (service-value
-     (fold-services (operating-system-services os)
-                    #:target-type shepherd-root-service-type)))
+    (shepherd-configuration-services
+     (service-value
+      (fold-services (operating-system-services os)
+                     #:target-type shepherd-root-service-type))))
 
   (mlet* %store-monad ((live-services (running-services eval)))
     (let*-values (((to-unload to-restart)