diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2020-03-27 15:24:54 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2020-03-27 15:30:44 +0100 |
| commit | bc3fda5d2b97526cee7d1b127e95067521dfb99e (patch) | |
| tree | 337176a1c0ee203ca605312bae79377b618b6f11 /gnu/services/nfs.scm | |
| parent | 9483782a617c66b8e066ac7f1898e41f99eb8456 (diff) | |
| download | patches-bc3fda5d2b97526cee7d1b127e95067521dfb99e.tar patches-bc3fda5d2b97526cee7d1b127e95067521dfb99e.tar.gz | |
services/nfs: Replace nfs-version with nfs-versions.base-for-series-3308
Instead of accepting a string for just one protocol version accept a list of
supported versions.
* gnu/services/nfs.scm (<nfs-configuration>)[nfs-version]: Remove field and
replace...
[nfs-versions]: ...with this new field.
(nfs-shepherd-services): Pass as many "--nfs-version" options as there are
supported versions.
* doc/guix.texi (Network File System): Document nfs-versions.
Diffstat (limited to 'gnu/services/nfs.scm')
| -rw-r--r-- | gnu/services/nfs.scm | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm index cbaa97b2fd..4e358197e2 100644 --- a/gnu/services/nfs.scm +++ b/gnu/services/nfs.scm @@ -245,8 +245,8 @@ nfs-configuration? (nfs-utils nfs-configuration-nfs-utils (default nfs-utils)) - (nfs-version nfs-configuration-nfs-version - (default #f)) ; string + (nfs-versions nfs-configuration-nfs-versions + (default '("4.2" "4.1" "4.0"))) (exports nfs-configuration-exports (default '())) (rpcmountd-port nfs-configuration-rpcmountd-port @@ -270,7 +270,7 @@ (define (nfs-shepherd-services config) "Return a list of <shepherd-service> for the NFS daemons with CONFIG." (match-record config <nfs-configuration> - (nfs-utils nfs-version exports + (nfs-utils nfs-versions exports rpcmountd-port rpcstatd-port nfsd-port nfsd-threads pipefs-directory debug) (list (shepherd-service @@ -323,15 +323,16 @@ (requirement '(/proc/fs/nfsd rpc.statd networking)) (start #~(lambda _ - (zero? (system* #$(file-append nfs-utils "/sbin/rpc.nfsd") - #$@(if (member 'nfsd debug) - '("--debug") - '()) - "--port" #$(number->string nfsd-port) - #$@(if nfs-version - '("--nfs-version" nfs-version) - '()) - #$(number->string nfsd-threads))))) + (zero? (apply system* #$(file-append nfs-utils "/sbin/rpc.nfsd") + (list + #$@(if (member 'nfsd debug) + '("--debug") + '()) + "--port" #$(number->string nfsd-port) + #$@(map (lambda (version) + (string-append "--nfs-version=" version)) + nfs-versions) + #$(number->string nfsd-threads)))))) (stop #~(lambda _ (zero? |