diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-11-02 18:44:17 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-11-02 22:25:11 +0100 |
| commit | d62e201cfd0f1e48c14586489d0e2b80ce943d4f (patch) | |
| tree | d6c4989b36b54f154f21363ac72bd9896729f2de /guix | |
| parent | 3a391e68dafe81560d3e4936a1ec5ac3b06d43bb (diff) | |
| download | gnu-guix-d62e201cfd0f1e48c14586489d0e2b80ce943d4f.tar gnu-guix-d62e201cfd0f1e48c14586489d0e2b80ce943d4f.tar.gz | |
services: Add 'system-service-type'.
* gnu/services.scm (system-derivation): New procedure.
(system-service-type): New variable.
(boot-script-entry): New procedure.
(boot-service-type): Extend SYSTEM-SERVICE-TYPE.
(etc-entry): New procedure.
(etc-service-type): Extend SYSTEM-SERVICE-TYPE.
(fold-services): Change default #:target-type to SYSTEM-SERVICE-TYPE.
* gnu/system.scm (operating-system-directory-base-entries): New procedure.
(essential-services): Use it. Add an instance of
SYSTEM-SERVICE-TYPE.
(operating-system-boot-script): Pass #:target-type to 'fold-services'.
(operating-system-derivation): Rewrite in terms of 'fold-services'.
* gnu/system/linux-container.scm (system-container): Remove.
(container-script): Use 'operating-system-derivation'.
* guix/scripts/system.scm (export-extension-graph): Replace
BOOT-SERVICE-TYPE by SYSTEM-SERVICE-TYPE.
* doc/images/service-graph.dot: Add 'system' node and edges.
* doc/guix.texi (Service Composition): Mention SYSTEM-SERVICE-TYPE.
(Service Reference): Document it. Update 'fold-services'
documentation.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/scripts/system.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 7be734785a..7a8a751df9 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -491,10 +491,10 @@ building anything." (define (export-extension-graph os port) "Export the service extension graph of OS to PORT." (let* ((services (operating-system-services os)) - (boot (find (lambda (service) - (eq? (service-kind service) boot-service-type)) + (system (find (lambda (service) + (eq? (service-kind service) system-service-type)) services))) - (export-graph (list boot) (current-output-port) + (export-graph (list system) (current-output-port) #:node-type (service-node-type services) #:reverse-edges? #t))) |