aboutsummaryrefslogtreecommitdiff
path: root/gnu/system.scm
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-08-18 23:56:16 -0400
committerMark H Weaver <mhw@netris.org>2015-08-18 23:56:16 -0400
commit3b65abacff0e15b2fde8dc38b5197fe6f3877f77 (patch)
tree1ccc088ad87b1d2121746b7e68fdcd40f1918d67 /gnu/system.scm
parent46c92ea058cce4b744f2f4549c21f62c39238add (diff)
downloadguix-3b65abacff0e15b2fde8dc38b5197fe6f3877f77.tar
guix-3b65abacff0e15b2fde8dc38b5197fe6f3877f77.tar.gz
Revert "PRELIMINARY: Add three programs to %setuid-programs."
This reverts commit fb1e06fc5f7648ab3078876f009fa7a983b17c41.
Diffstat (limited to 'gnu/system.scm')
-rw-r--r--gnu/system.scm11
1 files changed, 2 insertions, 9 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index a809451388..ea6e9c13ea 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -42,8 +42,6 @@
#:use-module (gnu packages man)
#:use-module (gnu packages compression)
#:use-module (gnu packages firmware)
- #:use-module (gnu packages glib)
- #:use-module (gnu packages polkit)
#:autoload (gnu packages cryptsetup) (cryptsetup)
#:use-module (gnu services)
#:use-module (gnu services dmd)
@@ -639,18 +637,13 @@ use 'plain-file' instead~%")
(define %setuid-programs
;; Default set of setuid-root programs.
- (let ((shadow (@ (gnu packages admin) shadow))
- ;; XXX Remove this hack when the main 'dbus' package is fixed.
- (dbus (@@ (gnu packages glib) dbus-fixed)))
+ (let ((shadow (@ (gnu packages admin) shadow)))
(list #~(string-append #$shadow "/bin/passwd")
#~(string-append #$shadow "/bin/su")
#~(string-append #$inetutils "/bin/ping")
#~(string-append #$inetutils "/bin/ping6")
#~(string-append #$sudo "/bin/sudo")
- #~(string-append #$fuse "/bin/fusermount")
- #~(string-append #$dbus "/libexec/dbus-daemon-launch-helper") ; XXX should be group "messagebus" and mode 4550
- #~(string-append #$polkit "/bin/pkexec")
- #~(string-append #$polkit "/lib/polkit-1/polkit-agent-helper-1"))))
+ #~(string-append #$fuse "/bin/fusermount"))))
(define %sudoers-specification
;; Default /etc/sudoers contents: 'root' and all members of the 'wheel'