Subject: bug#63082: [PATCH v2 02/16] services: mpd: Streamline mpd-user-sanitizer and mympd-user-sanitizer.

From: Maxim Cournoyer <[email-masked]>
Date: Sat, 29 Apr 2023 13:21:39 -0400

* gnu/services/audio.scm (mpd-user-sanitizer, %mympd-user): Remove extraneous
group field, already inherited.
(%mpd-user, %mympd-user): Clarify %lazy-group explanatory comment.  Fix
indentation.
---
 gnu/services/audio.scm | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm
index 6e4ce3f9fb..dc83479e40 100644
--- a/gnu/services/audio.scm
+++ b/gnu/services/audio.scm
@@ -184,13 +184,15 @@ (define-maybe boolean (prefix mpd-))
 
 (define %mpd-user
   (user-account
-      (name "mpd")
-      (group %lazy-group)
-      (system? #t)
-      (comment "Music Player Daemon (MPD) user")
-      ;; MPD can use $HOME (or $XDG_CONFIG_HOME) to place its data
-      (home-directory "/var/lib/mpd")
-      (shell (file-append shadow "/sbin/nologin"))))
+   (name "mpd")
+   ;; XXX: This is a place-holder to be lazily substituted in (…-accounts)
+   ;; with the value from the 'group' field of <mpd-configuration>.
+   (group %lazy-group)
+   (system? #t)
+   (comment "Music Player Daemon (MPD) user")
+   ;; MPD can use $HOME (or $XDG_CONFIG_HOME) to place its data.
+   (home-directory "/var/lib/mpd")
+   (shell (file-append shadow "/sbin/nologin"))))
 
 (define %mpd-group
   (user-group
@@ -235,10 +237,7 @@ (define (mpd-user-sanitizer value)
 user-account instead~%"))
          (user-account
           (inherit %mpd-user)
-          (name value)
-          ;; XXX: This is to be lazily substituted in (…-accounts)
-          ;; with the value from 'group'.
-          (group %lazy-group)))
+          (name value)))
         (else
          (configuration-field-error #f 'user value))))
 
@@ -676,12 +675,14 @@ (define-maybe/no-serialization mympd-ip-acl)
 
 (define %mympd-user
   (user-account
-      (name "mympd")
-      (group %lazy-group)
-      (system? #t)
-      (comment "myMPD user")
-      (home-directory "/var/empty")
-      (shell (file-append shadow "/sbin/nologin"))))
+   (name "mympd")
+   ;; XXX: This is a place-holder to be lazily substituted in 'mympd-accounts'
+   ;; with the value from the 'group' field of <mympd-configuration>.
+   (group %lazy-group)
+   (system? #t)
+   (comment "myMPD user")
+   (home-directory "/var/empty")
+   (shell (file-append shadow "/sbin/nologin"))))
 
 (define %mympd-group
   (user-group
@@ -696,10 +697,7 @@ (define (mympd-user-sanitizer value)
 user-account instead~%"))
          (user-account
           (inherit %mympd-user)
-          (name value)
-          ;; XXX: this is to be lazily substituted in (…-accounts)
-          ;; with the value from 'group'.
-          (group %lazy-group)))
+          (name value)))
         (else
          (configuration-field-error #f 'user value))))
 
-- 
2.39.2