summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2020-01-03 17:48:49 +0100
committerRicardo Wurmus <rekado@elephly.net>2020-01-08 23:56:16 +0100
commitba1808d5e7342ec749b006276bece6499cfaa4ba (patch)
tree3cdf78e23e8ae7709e457a6904a2f2bd441127d7
parent981ce38937c21ed1395c0a6ff7e384890234fa62 (diff)
downloadpatches-ba1808d5e7342ec749b006276bece6499cfaa4ba.tar
patches-ba1808d5e7342ec749b006276bece6499cfaa4ba.tar.gz
services: nfs: Allow rpcbind-service-type to be extended.
* gnu/services/nfs.scm (rpcbind-service-type): Rewrite using SERVICE-TYPE to add ability to extend the service.
-rw-r--r--gnu/services/nfs.scm47
1 files changed, 30 insertions, 17 deletions
diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm
index 834e94a800..0681e764ec 100644
--- a/gnu/services/nfs.scm
+++ b/gnu/services/nfs.scm
@@ -56,23 +56,36 @@
(default #t)))
(define rpcbind-service-type
- (shepherd-service-type
- 'rpcbind
- (lambda (config)
- (define rpcbind
- (rpcbind-configuration-rpcbind config))
-
- (define rpcbind-command
- #~(list (string-append #$rpcbind "/bin/rpcbind") "-f"
- #$@(if (rpcbind-configuration-warm-start? config) '("-w") '())))
-
- (shepherd-service
- (documentation "Start the RPC bind daemon.")
- (requirement '(networking))
- (provision '(rpcbind-daemon))
-
- (start #~(make-forkexec-constructor #$rpcbind-command))
- (stop #~(make-kill-destructor))))))
+ (let ((proc
+ (lambda (config)
+ (define rpcbind
+ (rpcbind-configuration-rpcbind config))
+
+ (define rpcbind-command
+ #~(list (string-append #$rpcbind "/bin/rpcbind") "-f"
+ #$@(if (rpcbind-configuration-warm-start? config) '("-w") '())))
+
+ (shepherd-service
+ (documentation "Start the RPC bind daemon.")
+ (requirement '(networking))
+ (provision '(rpcbind-daemon))
+
+ (start #~(make-forkexec-constructor #$rpcbind-command))
+ (stop #~(make-kill-destructor))))))
+ (service-type
+ (name 'rpcbind)
+ (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)
+ (match values
+ ((first . rest) first)
+ (_ config))))
+ (default-value (rpcbind-configuration)))))