diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-05-04 00:18:46 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-05-04 00:18:46 +0200 |
| commit | ad896f23a5fac38294e7515587c0c5bda02e9a59 (patch) | |
| tree | 54575c93620e934959d63e80b5080a949848d42f | |
| parent | e102f940976ad3703981e7f7bf5455843054d687 (diff) | |
| download | patches-ad896f23a5fac38294e7515587c0c5bda02e9a59.tar patches-ad896f23a5fac38294e7515587c0c5bda02e9a59.tar.gz | |
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'.
| -rw-r--r-- | guix/build/activation.scm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/build/activation.scm b/guix/build/activation.scm index 6930a8c585..f9d9ba5cbd 100644 --- a/guix/build/activation.scm +++ b/guix/build/activation.scm @@ -19,6 +19,7 @@ (define-module (guix build activation) #:use-module (guix build utils) #:use-module (ice-9 ftw) + #:use-module (srfi srfi-26) #:export (activate-etc activate-setuid-programs)) @@ -85,7 +86,8 @@ (format #t "setting up setuid programs in '~a'...~%" %setuid-directory) (if (file-exists? %setuid-directory) - (for-each delete-file + (for-each (compose delete-file + (cut string-append %setuid-directory "/" <>)) (scandir %setuid-directory (lambda (file) (not (member file '("." "..")))) |