From 3a391e68dafe81560d3e4936a1ec5ac3b06d43bb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 2 Nov 2015 17:01:32 +0100 Subject: services: Clarify extend/compose of BOOT-SERVICE-TYPE. * gnu/services.scm (compute-boot-script): Add first placeholder parameter. (boot-service-type): Change 'compose' to APPEND, and 'extend' to COMPUTE-BOOT-SCRIPT. --- gnu/services.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/services.scm b/gnu/services.scm index c8a2a2604f..ecf3532e52 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -182,7 +182,7 @@ (define-syntax modify-services ;;; Core services. ;;; -(define (compute-boot-script mexps) +(define (compute-boot-script _ mexps) (mlet %store-monad ((gexps (sequence %store-monad mexps))) (gexp->file "boot" #~(begin @@ -203,16 +203,14 @@ (define (compute-boot-script mexps) ;; Activate the system and spawn dmd. #$@gexps)))) -(define (second-argument a b) b) - (define boot-service-type ;; The service of this type is extended by being passed gexps as monadic ;; values. It aggregates them in a single script, as a monadic value, which ;; becomes its 'parameters'. It is the only service that extends nothing. (service-type (name 'boot) (extensions '()) - (compose compute-boot-script) - (extend second-argument))) + (compose append) + (extend compute-boot-script))) (define %boot-service ;; This is the ultimate service, the root of the service DAG. @@ -296,6 +294,8 @@ (define (gexps->activation-gexp gexps) (mlet %store-monad ((script (activation-script gexps))) (return #~(primitive-load #$script)))) +(define (second-argument a b) b) + (define activation-service-type (service-type (name 'activate) (extensions -- cgit v1.2.3