diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2019-10-06 22:02:20 +0200 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2019-10-06 22:02:20 +0200 |
commit | e08902d3cbb307e1523485becbbdaf9aed56ac4a (patch) | |
tree | ca79454c4146f37c0e0f4d354d434816928812ed /gnu/system.scm | |
parent | 1714edc3d4e8d6da1b0cdef300ae882d0885f182 (diff) | |
parent | f58702465d0b2daab1775d29439b73b4486a108a (diff) | |
download | guix-e08902d3cbb307e1523485becbbdaf9aed56ac4a.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system.scm')
-rw-r--r-- | gnu/system.scm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 37573fd153..a353b1a5c8 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -829,7 +829,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' |