guix/guix
3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Code Issues Releases Wiki Activity

Revert "services: nfs: Define rpcbind-shepherd-service at the top level."

Browse source 
This reverts commit 0a9e82b430, which didn't end
up fixing anything.  The problem was elsewhere; namely, using
'operating-system-services' instead of 'operating-system-user-services'.
This commit is contained in:
Maxim Cournoyer 2022-03-17 16:48:21 -04:00
parent 0a9e82b430
commit 2c4284d952
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gnu/services/nfs.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -62,26 +62,28 @@
(warm-start? rpcbind-configuration-warm-start?
(default #t)))
(define (rpcbind-shepherd-service config)
(let ((rpcbind (file-append (rpcbind-configuration-rpcbind config)
"/sbin/rpcbind")))
(define rpcbind-service-type
(let ((proc
(lambda (config)
(define rpcbind
(rpcbind-configuration-rpcbind config))
(define rpcbind-command
#~(list (string-append #$rpcbind "/sbin/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
(list #$rpcbind "-f"
#$@(if (rpcbind-configuration-warm-start? config)
'("-w")
'()))))
(stop #~(make-kill-destructor)))))
(define rpcbind-service-type
(start #~(make-forkexec-constructor #$rpcbind-command))
(stop #~(make-kill-destructor))))))
(service-type
(name 'rpcbind)
(extensions
(list (service-extension shepherd-root-service-type
(compose list rpcbind-shepherd-service))))
(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.
@ -90,7 +92,7 @@
(match values
((first . rest) first)
(_ config))))
(default-value (rpcbind-configuration))))
(default-value (rpcbind-configuration)))))