branch master updated: system: Fix a blown FUSE.

[guix-commits]

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

nckx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 2d8fac3fd9 system: Fix a blown FUSE.
2d8fac3fd9 is described below

commit 2d8fac3fd9f0914cd5e420318f6b16399a355e9c
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Jul 30 02:00:00 2023 +0200

    system: Fix a blown FUSE.
    
    I bungled up a merge conflict between 789f7e9 (gnu: fuse@3: Bind to
    default FUSE variable.) and my other setuid-related changes.
    
    * gnu/system.scm (%setuid-programs): Look for /bin/fusermount in
    FUSE-2, not 3.
    
    Reported by renngar[m] in #guix.
---
 gnu/system.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 5598643910..279b9df5c0 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1243,7 +1243,7 @@ deprecated; use 'setuid-program' instead~%"))
                (file-append inetutils "/bin/ping6")
                (file-append sudo "/bin/sudo")
                (file-append sudo "/bin/sudoedit")
-               (file-append fuse "/bin/fusermount")
+               (file-append fuse-2 "/bin/fusermount")
                (file-append fuse "/bin/fusermount3")
 
                ;; To allow mounts with the "user" option, "mount" and "umount" 
must