summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2020-01-03 17:50:45 +0100
committerRicardo Wurmus <rekado@elephly.net>2020-01-08 23:56:16 +0100
commit25c8c8cd4f384f9da08ea277bc5da16ca26128de (patch)
treeab2e23784cf99b0f5316fcc3d05a3ed7ceceac0f
parentba1808d5e7342ec749b006276bece6499cfaa4ba (diff)
downloadpatches-25c8c8cd4f384f9da08ea277bc5da16ca26128de.tar
patches-25c8c8cd4f384f9da08ea277bc5da16ca26128de.tar.gz
services: nfs: Allow pipefs-service-type to be extended.
* gnu/services/nfs.scm (pipefs-service-type): Rewrite using SERVICE-TYPE to add ability to extend the service.
-rw-r--r--gnu/services/nfs.scm39
1 files changed, 25 insertions, 14 deletions
diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm
index 0681e764ec..1b5dcb0e97 100644
--- a/gnu/services/nfs.scm
+++ b/gnu/services/nfs.scm
@@ -24,6 +24,7 @@
#:use-module (gnu packages linux)
#:use-module (guix)
#:use-module (guix records)
+ #:use-module (srfi srfi-1)
#:use-module (ice-9 match)
#:use-module (gnu build file-systems)
#:export (rpcbind-service-type
@@ -96,23 +97,33 @@
(default default-pipefs-directory)))
(define pipefs-service-type
- (shepherd-service-type
- 'pipefs
- (lambda (config)
- (define pipefs-directory (pipefs-configuration-mount-point config))
+ (let ((proc
+ (lambda (config)
+ (define pipefs-directory (pipefs-configuration-mount-point config))
- (shepherd-service
- (documentation "Mount the pipefs pseudo file system.")
- (provision '(rpc-pipefs))
+ (shepherd-service
+ (documentation "Mount the pipefs pseudo file system.")
+ (provision '(rpc-pipefs))
- (start #~(lambda ()
- (mkdir-p #$pipefs-directory)
- (mount "rpc_pipefs" #$pipefs-directory "rpc_pipefs")
- (member #$pipefs-directory (mount-points))))
+ (start #~(lambda ()
+ (mkdir-p #$pipefs-directory)
+ (mount "rpc_pipefs" #$pipefs-directory "rpc_pipefs")
+ (member #$pipefs-directory (mount-points))))
- (stop #~(lambda (pid . args)
- (umount #$pipefs-directory MNT_DETACH)
- (not (member #$pipefs-directory (mount-points)))))))))
+ (stop #~(lambda (pid . args)
+ (umount #$pipefs-directory MNT_DETACH)
+ (not (member #$pipefs-directory (mount-points)))))))))
+ (service-type
+ (name 'pipefs)
+ (extensions
+ (list (service-extension shepherd-root-service-type
+ (compose list proc))))
+ ;; We use the extensions feature to allow other services to automatically
+ ;; configure and start this service. Only one value can be provided. We
+ ;; override it with the value returned by the extending service.
+ (compose identity)
+ (extend (lambda (config values) (first values)))
+ (default-value (pipefs-configuration)))))