summaryrefslogtreecommitdiff
path: root/gnu/build
diff options
context:
space:
mode:
authorLeo Nikkilä <hello@lnikki.la>2022-04-11 01:00:08 +0300
committerLudovic Courtès <ludo@gnu.org>2022-04-12 23:40:44 +0200
commite1f0c88ea221d846b5a533c4dc88e99e953af63e (patch)
tree98bbfe52dc1ae54ad483d04e3ce5ad005e944bb1 /gnu/build
parent8805c7eab1d375846dd648065979d8d1a062f176 (diff)
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>
Diffstat (limited to 'gnu/build')
-rw-r--r--gnu/build/shepherd.scm6
1 files changed, 6 insertions, 0 deletions
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