From 2c4284d9522e20c8a2a801e1c0652f1fefb627cb Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Thu, 17 Mar 2022 16:48:21 -0400
Subject: Revert "services: nfs: Define rpcbind-shepherd-service at the top
 level."

This reverts commit 0a9e82b43080275a2755624f3208287056dc9f95, which didn't end
up fixing anything.  The problem was elsewhere; namely, using
'operating-system-services' instead of 'operating-system-user-services'.
---
 gnu/services/nfs.scm | 60 +++++++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm
index 78bf45f336..0d1617354e 100644
--- a/gnu/services/nfs.scm
+++ b/gnu/services/nfs.scm
@@ -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,35 +62,37 @@
   (warm-start?         rpcbind-configuration-warm-start?
                        (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
-  (service-type
-   (name 'rpcbind)
-   (extensions
-    (list (service-extension shepherd-root-service-type
-                             (compose list rpcbind-shepherd-service))))
-   ;; 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))))
+  (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 #$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)))))
 
 
 
-- 
cgit v1.2.3