diff options
| author | Brice Waegeneire <brice@waegenei.re> | 2021-07-06 22:03:20 +0200 |
|---|---|---|
| committer | Christopher Lemmer Webber <cwebber@dustycloud.org> | 2021-07-29 11:32:48 -0400 |
| commit | a85ec0bf69df9ec3333a214feff54d4e58b15bec (patch) | |
| tree | 3f5623ae3651936d9106bd139b4b66ffc834277b /gnu/system.scm | |
| parent | a7ac19851baab3fbcc40c4b2cf5b00a6ac9cd2f3 (diff) | |
services: Migrate to <setuid-program>.
* gnu/services/dbus.scm (dbus-setuid-programs, polkit-setuid-programs):
Return setuid-programs.
* gnu/services/desktop.scm (enlightenment-setuid-programs): Return
setuid-programs.
(%desktop-services)[mount-setuid-helpers]: Use setuid-programs.
* gnu/services/docker.scm (singularity-setuid-programs): Return
setuid-programs.
* gnu/services/xorg.scm(screen-locker-setuid-programs): Return
setuid-programs.
* gnu/system.scm (%setuid-programs): Return setuid-programs.
* doc/guix.texi (Setuid Programs, operating-system Reference): Replace
'list of G-expressions' with 'list of <setuid-program>'.
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 11e7152be1b..7e11d38c59c 100644 --- a/gnu/system.scm +++ b/gnu/system.scm | |||
| @@ -1074,22 +1074,23 @@ use 'plain-file' instead~%") | |||
| 1074 | (define %setuid-programs | 1074 | (define %setuid-programs |
| 1075 | ;; Default set of setuid-root programs. | 1075 | ;; Default set of setuid-root programs. |
| 1076 | (let ((shadow (@ (gnu packages admin) shadow))) | 1076 | (let ((shadow (@ (gnu packages admin) shadow))) |
| 1077 | (list (file-append shadow "/bin/passwd") | 1077 | (map file-like->setuid-program |
| 1078 | (file-append shadow "/bin/sg") | 1078 | (list (file-append shadow "/bin/passwd") |
| 1079 | (file-append shadow "/bin/su") | 1079 | (file-append shadow "/bin/sg") |
| 1080 | (file-append shadow "/bin/newgrp") | 1080 | (file-append shadow "/bin/su") |
| 1081 | (file-append shadow "/bin/newuidmap") | 1081 | (file-append shadow "/bin/newgrp") |
| 1082 | (file-append shadow "/bin/newgidmap") | 1082 | (file-append shadow "/bin/newuidmap") |
| 1083 | (file-append inetutils "/bin/ping") | 1083 | (file-append shadow "/bin/newgidmap") |
| 1084 | (file-append inetutils "/bin/ping6") | 1084 | (file-append inetutils "/bin/ping") |
| 1085 | (file-append sudo "/bin/sudo") | 1085 | (file-append inetutils "/bin/ping6") |
| 1086 | (file-append sudo "/bin/sudoedit") | 1086 | (file-append sudo "/bin/sudo") |
| 1087 | (file-append fuse "/bin/fusermount") | 1087 | (file-append sudo "/bin/sudoedit") |
| 1088 | 1088 | (file-append fuse "/bin/fusermount") | |
| 1089 | ;; To allow mounts with the "user" option, "mount" and "umount" must | 1089 | |
| 1090 | ;; be setuid-root. | 1090 | ;; To allow mounts with the "user" option, "mount" and "umount" must |
| 1091 | (file-append util-linux "/bin/mount") | 1091 | ;; be setuid-root. |
| 1092 | (file-append util-linux "/bin/umount")))) | 1092 | (file-append util-linux "/bin/mount") |
| 1093 | (file-append util-linux "/bin/umount"))))) | ||
| 1093 | 1094 | ||
| 1094 | (define %sudoers-specification | 1095 | (define %sudoers-specification |
| 1095 | ;; Default /etc/sudoers contents: 'root' and all members of the 'wheel' | 1096 | ;; Default /etc/sudoers contents: 'root' and all members of the 'wheel' |
