summary refs log tree commit diff
path: root/gnu/system.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-10-06 11:44:06 +0200
committerLudovic Courtès <ludo@gnu.org>2019-10-06 14:45:35 +0200
commit19944227528502e3619a6d1557bc735224f6fef6 (patch)
tree811bd9a3cddd1b819f4e4013d0aef91150f99f17 /gnu/system.scm
parent5a65fede0b44424a420c905b59fa16282285de77 (diff)
downloadguix-19944227528502e3619a6d1557bc735224f6fef6.tar.gz
system: Add 'mount' and 'umount' to '%setuid-programs'.
Fixes <https://bugs.gnu.org/37569>.
Reported by Diego Nicola Barbato <dnbarbato@posteo.de>.

* gnu/system.scm (%setuid-programs): Add "mount" and "umount" from
util-linux.
Diffstat (limited to 'gnu/system.scm')
-rw-r--r--gnu/system.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index c860c22433..c57b302c4e 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -825,7 +825,12 @@ use 'plain-file' instead~%")
           (file-append inetutils "/bin/ping6")
           (file-append sudo "/bin/sudo")
           (file-append sudo "/bin/sudoedit")
-          (file-append fuse "/bin/fusermount"))))
+          (file-append fuse "/bin/fusermount")
+
+          ;; To allow mounts with the "user" option, "mount" and "umount" must
+          ;; be setuid-root.
+          (file-append util-linux "/bin/mount")
+          (file-append util-linux "/bin/umount"))))
 
 (define %sudoers-specification
   ;; Default /etc/sudoers contents: 'root' and all members of the 'wheel'