diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2024-08-18 02:00:00 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2024-08-18 02:00:00 +0200 |
| commit | 2e57152147d42e6ad9f2bdb17958ad395efe05cc (patch) | |
| tree | 43cc1a6df85bce25d346801c01ea9c7cfb145172 /gnu/services | |
| parent | 23536a9871464b1f3b3d73e808e13d8f2a2366dd (diff) | |
| download | guix-2e57152147d42e6ad9f2bdb17958ad395efe05cc.tar.gz guix-2e57152147d42e6ad9f2bdb17958ad395efe05cc.zip | |
services: Migrate enlightenment to (gnu system privilege).
* gnu/services/desktop.scm
(enlightenment-setuid-programs): Rename from this…
(enlightenment-privileged-programs): …to this, replacing
‘setuid’ variables with their ‘privileged’ counterparts.
(enlightenment-desktop-service-type): Adjust accordingly.
Change-Id: Ied2a93eb948c4df35e2b384eeee8181937b474de
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/desktop.scm | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 9c4d2a1822..b8dc4a4912 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2017, 2019 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2019 David Wilson <david@daviwil.com> -;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2020, 2024 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Reza Alizadeh Majd <r.majd@pantherx.org> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2021, 2022 muradm <mail@muradm.net> @@ -49,7 +49,7 @@ file-system)) #:autoload (gnu services sddm) (sddm-service-type) #:use-module (gnu system) - #:use-module (gnu system setuid) + #:use-module (gnu system privilege) #:use-module (gnu system shadow) #:use-module (gnu system uuid) #:use-module (gnu system pam) @@ -1732,11 +1732,12 @@ need to create it beforehand.")))) (enlightenment enlightenment-package (default enlightenment))) -(define (enlightenment-setuid-programs enlightenment-desktop-configuration) +(define (enlightenment-privileged-programs enlightenment-desktop-configuration) (match-record enlightenment-desktop-configuration <enlightenment-desktop-configuration> (enlightenment) - (map file-like->setuid-program + (map (lambda (program) (privileged-program (program program) + (setuid? #t))) (list (file-append enlightenment "/lib/enlightenment/utils/enlightenment_sys") (file-append enlightenment @@ -1758,8 +1759,8 @@ need to create it beforehand.")))) (package-direct-input-selector "ddcutil") enlightenment-package)) - (service-extension setuid-program-service-type - enlightenment-setuid-programs) + (service-extension privileged-program-service-type + enlightenment-privileged-programs) (service-extension profile-service-type (compose list enlightenment-package)))) @@ -1767,7 +1768,7 @@ need to create it beforehand.")))) (description "Return a service that adds the @code{enlightenment} package to the system profile, and extends dbus with the ability for @code{efl} to generate -thumbnails and makes setuid the programs which enlightenment needs to function +thumbnails and privileges the programs which enlightenment needs to function as expected."))) ;;; @@ -2053,8 +2054,9 @@ applications needing access to be root.") ;; without root. (simple-service 'mount-setuid-helpers setuid-program-service-type (map (lambda (program) - (setuid-program - (program program))) + (privileged-program + (program program) + (setuid? #t))) (list (file-append nfs-utils "/sbin/mount.nfs") (file-append ntfs-3g "/sbin/mount.ntfs-3g")))) |