Skip to content
Snippets Groups Projects
Commit ad896f23 authored by Ludovic Courtès's avatar Ludovic Courtès
Browse files

activation: Fix deletion of setuid programs.

* guix/build/activation.scm (activate-setuid-programs): When
  %SETUID-DIRECTORY exists, pass the right file names to 'delete-file'.
parent e102f940
No related branches found
No related tags found
No related merge requests found
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
(define-module (guix build activation) (define-module (guix build activation)
#:use-module (guix build utils) #:use-module (guix build utils)
#:use-module (ice-9 ftw) #:use-module (ice-9 ftw)
#:use-module (srfi srfi-26)
#:export (activate-etc #:export (activate-etc
activate-setuid-programs)) activate-setuid-programs))
...@@ -85,7 +86,8 @@ (define (make-setuid-program prog) ...@@ -85,7 +86,8 @@ (define (make-setuid-program prog)
(format #t "setting up setuid programs in '~a'...~%" (format #t "setting up setuid programs in '~a'...~%"
%setuid-directory) %setuid-directory)
(if (file-exists? %setuid-directory) (if (file-exists? %setuid-directory)
(for-each delete-file (for-each (compose delete-file
(cut string-append %setuid-directory "/" <>))
(scandir %setuid-directory (scandir %setuid-directory
(lambda (file) (lambda (file)
(not (member file '("." "..")))) (not (member file '("." ".."))))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment