~ruther/guix-local

17073dafc59d62fb8cbb8b94d61d3ecc488ac59f — Mark H Weaver 9 years ago 5f2a7f4
Revert "services: elogind: Provide '%elogind-file-systems' by extension."

This reverts commit 3cf319a3f8e23831960a0f1320122cc514188a37.
2 files changed, 2 insertions(+), 7 deletions(-)

M gnu/services/desktop.scm
M gnu/system/file-systems.scm
M gnu/services/desktop.scm => gnu/services/desktop.scm +1 -7
@@ 27,8 27,6 @@
  #:use-module (gnu services avahi)
  #:use-module (gnu services xorg)
  #:use-module (gnu services networking)
  #:use-module ((gnu system file-systems)
                #:select (%elogind-file-systems))
  #:use-module (gnu system shadow)
  #:use-module (gnu system pam)
  #:use-module (gnu packages glib)


@@ 762,11 760,7 @@ seats.)"

                       ;; Extend PAM with pam_elogind.so.
                       (service-extension pam-root-service-type
                                          pam-extension-procedure)

                       ;; We need /run/user, /run/systemd, etc.
                       (service-extension file-system-service-type
                                          (const %elogind-file-systems))))))
                                          pam-extension-procedure)))))

(define* (elogind-service #:key (config (elogind-configuration)))
  "Return a service that runs the @command{elogind} login and seat management

M gnu/system/file-systems.scm => gnu/system/file-systems.scm +1 -0
@@ 257,6 257,7 @@ TARGET in the other system."
  (append (list %pseudo-terminal-file-system
                %shared-memory-file-system
                %immutable-store)
          %elogind-file-systems
          %control-groups))

;; File systems for Linux containers differ from %base-file-systems in that