ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: Migrate enlightenment to (gnu system privilege).

Browse source 
* 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
This commit is contained in:
Tobias Geerinckx-Rice 2024-08-18 02:00:00 +02:00
parent 23536a9871
commit 2e57152147
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gnu/services/desktop.scm
View file

@ -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 @@ (define-module (gnu services desktop)
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 @@ (define-record-type* <enlightenment-desktop-configuration>
(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 @@ (define enlightenment-desktop-service-type
(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 @@ (define enlightenment-desktop-service-type
(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 @@ (define* (desktop-services-for-system #:optional
;; 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"))))