~ruther/guix-local

38c2b503545c7f214ff7670bd9f62bdebb59186d — Ludovic Courtès 9 years ago 5fd66a3
Reinstate "services: elogind: Provide '%elogind-file-systems' by extension."

This reverts commit 17073dafc59d62fb8cbb8b94d61d3ecc488ac59f.
2 files changed, 7 insertions(+), 2 deletions(-)

M gnu/services/desktop.scm
M gnu/system/file-systems.scm
M gnu/services/desktop.scm => gnu/services/desktop.scm +7 -1
@@ 27,6 27,8 @@
  #: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)


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

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

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

(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 +0 -1
@@ 257,7 257,6 @@ 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