From 0dd8e4c35109ed8bc2406a0bc13e18823a334937 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Sep 2024 02:00:00 +0200 Subject: privilege: Add file-like->setuid-program helper. * gnu/system/privilege.scm (file-like->setuid-program): New public procedure. * gnu/system/setuid.scm: Re-export it for compatibility. (file-like->setuid-program): Remove this old version. * gnu/services/docker.scm (singularity-setuid-programs): Use it (again). * gnu/services/desktop.scm (enlightenment-privileged-programs): Likewise. Change-Id: I8e41144438677a15cdadb3063651dbc780715497 --- gnu/system/privilege.scm | 10 +++++++++- gnu/system/setuid.scm | 8 ++------ 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/privilege.scm b/gnu/system/privilege.scm index d89d5d5d1c..fe6e60ad7c 100644 --- a/gnu/system/privilege.scm +++ b/gnu/system/privilege.scm @@ -26,7 +26,9 @@ privileged-program-setgid? privileged-program-user privileged-program-group - privileged-program-capabilities)) + privileged-program-capabilities + + file-like->setuid-program)) ;;; Commentary: ;;; @@ -56,3 +58,9 @@ ;; POSIX capabilities in cap_from_text(3) form (defaults to #f: none). (capabilities privileged-program-capabilities ;string or #f (default #f))) + +(define (file-like->setuid-program program) + "Simple wrapper to facilitate MAPping over a list of file-like objects and +make them setuid, a pattern just common enough to justify a special helper." + (privileged-program (program program) + (setuid? #t))) diff --git a/gnu/system/setuid.scm b/gnu/system/setuid.scm index 4dd0cc8962..097797ce8d 100644 --- a/gnu/system/setuid.scm +++ b/gnu/system/setuid.scm @@ -21,15 +21,14 @@ #:use-module (gnu system privilege) #:use-module (ice-9 match) #:use-module (srfi srfi-1) + #:re-export (file-like->setuid-program) #:export (setuid-program setuid-program? setuid-program-program setuid-program-setuid? setuid-program-setgid? setuid-program-user - setuid-program-group - - file-like->setuid-program)) + setuid-program-group)) ;;; Commentary: ;;; @@ -56,6 +55,3 @@ (define setuid-program-setgid? privileged-program-setgid?) (define setuid-program-user privileged-program-user) (define setuid-program-group privileged-program-group) - -(define (file-like->setuid-program program) - (setuid-program (program program))) -- cgit v1.2.3 href='/guix/log/gnu/services/sound.scm?id=36641bc7c557e155edb7a5bad29a7334c6dfb639&showmsg=1'>Expand)Author 2023-03-07services: ladspa: Export accessors....* gnu/service/sound.scm: Export ladspa-configuration? and ladspa-configuration-plugins. (<ladspa-configuration>)[plugins]: Rename accessor to ladspa-configuration-plugins. (ladspa-environment): Adjust to use renamed plugin accessor. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Bruno Victal 2023-03-07services: alsa: Export accessors....* gnu/services/sound.scm: Export alsa-configuration?, alsa-configuration-alsa-plugins, alsa-configuration-pulseaudio? and alsa-configuration-extra-options. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Bruno Victal 2023-03-07services: pulseaudio: Export accessors....* gnu/services/sound.scm: Export pulseaudio-configuration?, pulseaudio-configuration-client-conf, pulseaudio-configuration-daemon-conf, pulseaudio-configuration-script-file, pulseaudio-configuration-extra-script-files and pulseaudio-configuration-system-script-file. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Bruno Victal 2022-12-28services: pulseaudio: Fix /etc/pulse/default.pa not being used....Fixes <https://issues.guix.gnu.org/60383>. * gnu/services/sound.scm (pulseaudio-etc): Produce daemon.conf unconditionally, with the correct default-script-file location. Produce client.conf unconditionally. Reported-by: Bruno Victal <mirai@makinata.eu> Maxim Cournoyer