From: Ricardo Wurmus <rekado@elephly.net>
To: 38902@debbugs.gnu.org
Cc: Ricardo Wurmus <rekado@elephly.net>
Subject: [bug#38902] [PATCH 4/9] services: nfs: Allow pipefs-service-type to be extended.
Date: Fri, 3 Jan 2020 18:35:01 +0100 [thread overview]
Message-ID: <20200103173506.9779-4-rekado@elephly.net> (raw)
In-Reply-To: <20200103173506.9779-1-rekado@elephly.net>
* gnu/services/nfs.scm (pipefs-service-type): Rewrite using SERVICE-TYPE to
add ability to extend the service.
---
gnu/services/nfs.scm | 39 +++++++++++++++++++++++++--------------
1 file 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)))))
\f
--
2.24.1
next prev parent reply other threads:[~2020-01-03 17:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-03 17:32 [bug#38902] [PATCH 0/9] Add NFS service Ricardo Wurmus
2020-01-03 17:34 ` [bug#38902] [PATCH 1/9] gnu: nfs-utils: Update to 2.4.2 Ricardo Wurmus
2020-01-03 17:34 ` [bug#38902] [PATCH 2/9] services: nfs: Fix name of package variable Ricardo Wurmus
2020-01-03 17:35 ` [bug#38902] [PATCH 3/9] services: nfs: Allow rpcbind-service-type to be extended Ricardo Wurmus
2020-01-03 17:35 ` Ricardo Wurmus [this message]
2020-01-03 17:35 ` [bug#38902] [PATCH 5/9] services: nfs: Fix indentation and typo Ricardo Wurmus
2020-01-03 17:35 ` [bug#38902] [PATCH 6/9] services: nfs: Allow idmap-service-type to be extended Ricardo Wurmus
2020-01-03 17:35 ` [bug#38902] [PATCH 7/9] services: nfs: Add verbosity control to idmap-service-type Ricardo Wurmus
2020-01-03 17:35 ` [bug#38902] [PATCH 8/9] services: nfs: Allow gss-service-type to be extended Ricardo Wurmus
2020-01-03 17:35 ` [bug#38902] [PATCH 9/9] services: nfs: Add nfs-service-type Ricardo Wurmus
2020-01-08 23:08 ` bug#38902: " Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200103173506.9779-4-rekado@elephly.net \
--to=rekado@elephly.net \
--cc=38902@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).