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: Rename setuid-program-service-type.

Browse source 
* gnu/services.scm (setuid-program->activation-gexp): Rename this…
(privileged-program->activation-gexp): …to this.
Operate on a list of <privileged-program> records.
(privileged-program-service-type): New variable, renamed from
setuid-program-service-type.  Rename the service-type accordingly.
(setuid-program-service-type): Redefine as an alias for the above.
This commit is contained in:
Tobias Geerinckx-Rice 2022-10-23 02:00:15 +02:00
parent f3b84be52d
commit d73ca7ecb6
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gnu/services.scm
View file

@ -46,6 +46,7 @@ (define-module (gnu services)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages hurd)
#:use-module (gnu system privilege)
#:use-module (gnu system setuid)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-9)
@ -120,7 +121,8 @@ (define-module (gnu services)
extra-special-file
etc-service-type
etc-directory
setuid-program-service-type
privileged-program-service-type
setuid-program-service-type ; deprecated
profile-service-type
firmware-service-type
gc-root-service-type
@ -889,17 +891,17 @@ (define-deprecated (etc-service files)
FILES must be a list of name/file-like object pairs."
(service etc-service-type files))
(define (setuid-program->activation-gexp programs)
"Return an activation gexp for setuid-program from PROGRAMS."
(define (privileged-program->activation-gexp programs)
"Return an activation gexp for privileged-program from PROGRAMS."
(let ((programs (map (lambda (program)
;; FIXME This is really ugly, I didn't managed to use
;; "inherit"
(let ((program-name (setuid-program-program program))
(setuid? (setuid-program-setuid? program))
(setgid? (setuid-program-setgid? program))
(user (setuid-program-user program))
(group (setuid-program-group program)) )
#~(setuid-program
(let ((program-name (privileged-program-program program))
(setuid? (privileged-program-setuid? program))
(setgid? (privileged-program-setgid? program))
(user (privileged-program-user program))
(group (privileged-program-group program)) )
#~(privileged-program
(setuid? #$setuid?)
(setgid? #$setgid?)
(user #$user)
@ -907,17 +909,17 @@ (define (setuid-program->activation-gexp programs)
(program #$program-name))))
programs)))
(with-imported-modules (source-module-closure
'((gnu system setuid)))
'((gnu system privilege)))
#~(begin
(use-modules (gnu system setuid))
(use-modules (gnu system privilege))
(activate-privileged-programs (list #$@programs))))))
(define setuid-program-service-type
(service-type (name 'setuid-program)
(define privileged-program-service-type
(service-type (name 'privileged-program)
(extensions
(list (service-extension activation-service-type
setuid-program->activation-gexp)))
privileged-program->activation-gexp)))
(compose concatenate)
(extend (lambda (config extensions)
(append config extensions)))
@ -929,6 +931,10 @@ (define setuid-program-service-type
symbolic links to their @file{/run/privileged/bin} counterpart. It will be
removed in a future Guix release.")))
(define setuid-program-service-type
;; Deprecated alias to ease transition. Will be removed!
privileged-program-service-type)
(define (packages->profile-entry packages)
"Return a system entry for the profile containing PACKAGES."
;; XXX: 'mlet' is needed here for one reason: to get the proper