summary refs log tree commit diff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2023-07-30 02:00:00 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2023-07-30 02:00:00 +0200
commit2d8fac3fd9f0914cd5e420318f6b16399a355e9c (patch)
treeefaed7045c86f5918f5394ed86c4598f8d7c2c75
parent7b2b0a5e1d635fb0e3d2d3e9141ac27c2db644b5 (diff)
downloadguix-2d8fac3fd9f0914cd5e420318f6b16399a355e9c.tar.gz
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.
-rw-r--r--gnu/system.scm2
1 files changed, 1 insertions, 1 deletions
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