From bd6639026bc04c9461545d199253ca64e1cb3467 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 28 May 2014 15:40:53 +0200 Subject: gnu: fuse: Allow use of 'fusermount' taken from $PATH. * gnu/packages/linux.scm (fuse) : Set FUSERMOUNT_DIR in lib/Makefile. --- gnu/packages/linux.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e4d9b67a45..7b46190d79 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -962,7 +962,15 @@ processes currently causing I/O.") "/bin/" maybe-u "mount"))) (substitute* '("util/mount.fuse.c") (("/bin/sh") - (which "sh")))) + (which "sh"))) + + ;; This hack leads libfuse to search for 'fusermount' in + ;; $PATH, where it may find a setuid-root binary, instead of + ;; trying solely $out/sbin/fusermount and failing because + ;; it's not setuid. + (substitute* "lib/Makefile" + (("-DFUSERMOUNT_DIR=[[:graph:]]+") + "-DFUSERMOUNT_DIR=\\\"/var/empty\\\""))) %standard-phases))) (home-page "http://fuse.sourceforge.net/") (synopsis "Support file systems implemented in user space") -- cgit v1.2.3