02/04: shepherd: Add #:supplementary-groups.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit e1f0c88ea221d846b5a533c4dc88e99e953af63e
Author: Leo Nikkilä <hello@lnikki.la>
AuthorDate: Mon Apr 11 01:00:08 2022 +0300

    shepherd: Add #:supplementary-groups.
    
    To support the argument introduced in Shepherd 0.9.0 when defining
    container-bound services.
    
    * gnu/build/shepherd.scm (exec-command*)
    (make-forkexec-constructor/container): Add '#:supplementary-groups'.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/build/shepherd.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/build/shepherd.scm b/gnu/build/shepherd.scm
index 595db40f2e..d52e53eb78 100644
--- a/gnu/build/shepherd.scm
+++ b/gnu/build/shepherd.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017, 2018, 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2020 Mathieu Othacehe <othacehe@gnu.org>
+;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -120,6 +121,7 @@ separate mount and PID name space.  Return the \"outer\" 
PID. "
      pid)))
 
 (define* (exec-command* command #:key user group log-file pid-file
+                        (supplementary-groups '())
                         (directory "/") (environment-variables (environ)))
   "Like 'exec-command', but first restore signal handles modified by
 shepherd (PID 1)."
@@ -135,6 +137,7 @@ shepherd (PID 1)."
   (exec-command command
                 #:user user
                 #:group group
+                #:supplementary-groups supplementary-groups
                 #:log-file log-file
                 #:directory directory
                 #:environment-variables environment-variables))
@@ -146,6 +149,7 @@ shepherd (PID 1)."
                                               (mappings '())
                                               (user #f)
                                               (group #f)
+                                              (supplementary-groups '())
                                               (log-file #f)
                                               pid-file
                                               (pid-file-timeout 5)
@@ -192,6 +196,8 @@ namespace, in addition to essential bind-mounts such /proc."
                                 (exec-command* command
                                                #:user user
                                                #:group group
+                                               #:supplementary-groups
+                                               supplementary-groups
                                                #:pid-file pid-file
                                                #:log-file log-file
                                                #:directory directory