From 095f4deb4b78c45ab284e47c1f427f9812b5a67b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 11 Sep 2014 21:25:58 +0200
Subject: [PATCH] activation: Factorize the link-or-copy trick.
* gnu/build/activation.scm (link-or-copy): New procedure.
(activate-setuid-programs): Use it.
---
gnu/build/activation.scm | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm
index 362669cbf91..d17bb7943fb 100644
--- a/gnu/build/activation.scm
+++ b/gnu/build/activation.scm
@@ -175,19 +175,24 @@ (define %setuid-directory
;; Place where setuid programs are stored.
"/run/setuid-programs")
+(define (link-or-copy source target)
+ "Attempt to make TARGET a hard link to SOURCE; if it fails, fall back to
+copy SOURCE to TARGET."
+ (catch 'system-error
+ (lambda ()
+ (link source target))
+ (lambda args
+ ;; Perhaps SOURCE and TARGET live in a different file system, so copy
+ ;; SOURCE.
+ (copy-file source target))))
+
(define (activate-setuid-programs programs)
"Turn PROGRAMS, a list of file names, into setuid programs stored under
%SETUID-DIRECTORY."
(define (make-setuid-program prog)
(let ((target (string-append %setuid-directory
"/" (basename prog))))
- (catch 'system-error
- (lambda ()
- (link prog target))
- (lambda args
- ;; Perhaps PROG and TARGET live in a different file system, so copy
- ;; PROG.
- (copy-file prog target)))
+ (link-or-copy prog target)
(chown target 0 0)
(chmod target #o6555)))
--
GitLab