ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

system: Accept gexps in 'setuid-programs'.

Browse source 
Commit a7ac19851b led configs such as the
following one, which were previously valid, to be rejected:

  (operating-system
    ;; ...
    (setuid-programs (cons #~(string-append #$wireshark "/bin/dumpcap")
                           %setuid-programs)))

They are now accepted again.

Reported by wonko on #guix.

* gnu/system.scm (%ensure-setuid-program-list): Handle the case where
PROGRAM is not a file-like.
This commit is contained in:
Ludovic Courtès 2021-08-12 12:08:55 +02:00
parent e0bd47b4fd
commit 2826f488e4
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/system.scm
View file

@ -1082,11 +1082,13 @@ (define (warn-once)
(set! warned? #t))) (set! warned? #t)))
(map (match-lambda (map (match-lambda
((? file-like? program)
(warn-once)
(setuid-program (program program)))
((? setuid-program? program) ((? setuid-program? program)
program)) program)
(program
;; PROGRAM is a file-like or a gexp like #~(string-append #$foo
;; "/bin/bar").
(warn-once)
(setuid-program (program program))))
lst)) lst))
(define %setuid-programs (define %setuid-programs