branch master updated: gnu: mergerfs: Hard-code output path in mount.mergerfs.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

lbraun pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new b310afde26 gnu: mergerfs: Hard-code output path in mount.mergerfs.
b310afde26 is described below

commit b310afde2696dc6b03f035c6734b068cddf2f129
Author: Lars-Dominik Braun <lars@6xq.net>
AuthorDate: Sun Oct 9 11:31:30 2022 +0200

    gnu: mergerfs: Hard-code output path in mount.mergerfs.
    
    This allows using mergerfs filesystems in /etc/fstab.
    
    * gnu/packages/file-systems.scm (mergerfs)[arguments]: Add clause to
    existing SUBSTITUTE*.
---
 gnu/packages/file-systems.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index d22ac5aab8..7a372ce982 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -1457,7 +1457,13 @@ On Guix System, you will need to invoke the included 
shell scripts as
                                                   "mount"))))
              (substitute* '("libfuse/util/mount.mergerfs.c")
                (("/bin/sh" command)
-                (string-append (assoc-ref inputs "bash-minimal") 
command))))))))
+                (string-append (assoc-ref inputs "bash-minimal") command))
+               ;; mount.mergerfs tries to execute `mergerfs`, which cannot be 
found
+               ;; without an absolute path. Hard-coding the path is fine, 
since we don’t
+               ;; link mount.mergerfs to mount.fuse anyway.
+               (("add_arg\\(&command, type\\);")
+                (string-append "add_arg(&command, \"" (assoc-ref outputs "out")
+                               "/bin/mergerfs\");"))))))))
     ;; Mergerfs bundles a heavily modified copy of fuse.
     (inputs
      (list bash-minimal util-linux))