me
/
guix
Archived
1
0
Fork 0
Code

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

Attempting to use the 'nfs-service-type' as part of a computed
operating-system definition, the following exception would be thrown:

  ice-9/boot-9.scm:1685:16: In procedure raise-exception:
  ERROR:
    1. &ambiguous-target-service-error:
        service: #<<service> type: #<service-type rpcbind 7f7529853780> value: #<<rpcbind-configuration> rpcbind: #<package rpcbind@1.2.6 gnu/packages/onc-rpc.scm:87 7f75389e78f0> warm-start?: #t>>
        target-type: #<service-type shepherd-root 7f7529396080>
    2. &message: "more than one target service of type 'shepherd-root'"

The problem was that the rpcbind shepherd-service object was dynamically
instantiated every time the rpcbind-service-type would be called, causing
multiple objects in some situations, resulting in the above condition.

* gnu/services/nfs.scm (rpcbind-service-type): Refactor and adjust in a way to
extract...
(rpcbind-shepherd-service): ... this new procedure.
Maxim Cournoyer 2022-03-17 14:31:21 -04:00
parent 276a767e2c
commit 0a9e82b430
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
gnu/services/nfs.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -62,37 +62,35 @@
(warm-start? rpcbind-configuration-warm-start? (warm-start? rpcbind-configuration-warm-start?
(default #t))) (default #t)))
(define (rpcbind-shepherd-service config)
(let ((rpcbind (file-append (rpcbind-configuration-rpcbind config)
"/sbin/rpcbind")))
(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 (define rpcbind-service-type
(let ((proc (service-type
(lambda (config) (name 'rpcbind)
(define rpcbind (extensions
(rpcbind-configuration-rpcbind config)) (list (service-extension shepherd-root-service-type
(compose list rpcbind-shepherd-service))))
(define rpcbind-command ;; We use the extensions feature to allow other services to automatically
#~(list (string-append #$rpcbind "/sbin/rpcbind") "-f" ;; configure and start this service. Only one value can be provided. We
#$@(if (rpcbind-configuration-warm-start? config) '("-w") '()))) ;; override it with the value returned by the extending service.
(compose identity)
(shepherd-service (extend (lambda (config values)
(documentation "Start the RPC bind daemon.") (match values
(requirement '(networking)) ((first . rest) first)
(provision '(rpcbind-daemon)) (_ config))))
(default-value (rpcbind-configuration))))
(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)))))