01/05: services: hurd: Remove hurd-user-processes-service-type.

[guix-commits]

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit ddc236420e8aac564147faa2cc7d8dcd36fa32c1
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sun Apr 26 00:13:21 2020 +0200

    services: hurd: Remove hurd-user-processes-service-type.
    
    * gnu/services/hurd.scm (hurd-user-processes-service-type): Remove struct.
    (hurd-console-shepherd-service): Remove procedure.
    * gnu/system.scm (hurd-default-essential-services): Add regular
    user-processes-service-type.
    * gnu/system/hurd.scm (hurd-shepherd-services): Remove
    hurd-user-processes-service-type.
---
 gnu/services/hurd.scm | 32 ++------------------------------
 gnu/system.scm        |  1 +
 2 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/gnu/services/hurd.scm b/gnu/services/hurd.scm
index db06909..d40d85a 100644
--- a/gnu/services/hurd.scm
+++ b/gnu/services/hurd.scm
@@ -38,8 +38,7 @@
             hurd-loopback-service-type
             hurd-service->shepherd-service
             hurd-ttys-configuration
-            hurd-ttys-service-type
-            hurd-user-processes-service-type))
+            hurd-ttys-service-type))
 
 ;;; Commentary:
 ;;;
@@ -58,7 +57,7 @@
       (($ <syslog-configuration>) (syslog-shepherd-service config))
       (('loopback) (hurd-loopback-shepherd-service #f))
       (('file-systems) (hurd-file-systems-shepherd-service #f))
-      (('user-processes) (hurd-user-processes-shepherd-service #f))
+      (('user-processes) ((@@ (gnu services shepherd) 
user-processes-shepherd-service) '()))
       (_ '()))))
 
 
@@ -139,33 +138,6 @@ Hurd.")))
 
 
 ;;;
-;;; Dummy hurd-user-processes service, required for guix-daemon.
-;;;
-
-(define (hurd-user-processes-shepherd-service _)
-  "Return the 'user-processes' Shepherd service."
-
-  (list (shepherd-service
-         (documentation "Dummy for bootstrapping (gnu services) on the Hurd.")
-         (provision '(user-processes))
-         (requirement '())
-         (start #~(const #t))
-         (stop #~(const #t))
-         (respawn? #f))))
-
-(define hurd-user-processes-service-type
-  (service-type
-   (name 'user-processes)
-   (extensions (list (service-extension shepherd-root-service-type
-                                        hurd-user-processes-shepherd-service)))
-   (compose concatenate)
-   (extend cons)
-   (default-value '(user-processes)) ;canary for hurd-service->shepherd-service
-   (description "Dummy service to bootstrap (gnu services) on the
-Hurd.")))
-
-
-;;;
 ;;; Simple wrapper for <hurd>/bin/console.
 ;;;
 
diff --git a/gnu/system.scm b/gnu/system.scm
index 30113bf..a600223 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -569,6 +569,7 @@ bookkeeping."
         %boot-service
         %shepherd-root-service
         %activation-service
+        (service user-processes-service-type '(user-processes))
         (account-service (append (operating-system-accounts os)
                                  (operating-system-groups os))
                          (operating-system-skeletons os))