From ad896f23a5fac38294e7515587c0c5bda02e9a59 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 4 May 2014 00:18:46 +0200 Subject: 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'. --- guix/build/activation.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'guix') 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 '("." "..")))) -- cgit v1.2.3