janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit ef039a5daf1456d15a283a1a474196d80189264c
Author: Jan (janneke) Nieuwenhuizen <[email protected]>
AuthorDate: Mon Apr 13 11:04:09 2020 +0200
services: Add hurd-user-services-service-type.
The `guix-daemon' service type depends on `user-services'. Provide a dummy
for that, so that we can use the guix-daemon service unmodified.
* gnu/services/hurd.scm (hurd-user-services-shepherd-service,
hurd-user-services-service-type): New function.
(hurd-service->shepherd-service): Add entry.
---
gnu/services/hurd.scm | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/gnu/services/hurd.scm b/gnu/services/hurd.scm
index 3394b79..0582dff 100644
--- a/gnu/services/hurd.scm
+++ b/gnu/services/hurd.scm
@@ -30,7 +30,8 @@
hurd-console-service-type
hurd-service->shepherd-service
hurd-ttys-configuration
- hurd-ttys-service-type))
+ hurd-ttys-service-type
+ hurd-user-processes-service-type))
;;; Commentary:
;;;
@@ -44,10 +45,38 @@
(match config
(($ <hurd-console-configuration>) (hurd-console-shepherd-service config))
(($ <hurd-ttys-configuration>) (hurd-ttys-shepherd-service config))
+ (('user-processes) (hurd-user-processes-shepherd-service #f))
(_ '()))))
;;;
+;;; 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 append)
+ (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.
;;;
