nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reinstate "services: elogind: Provide '%elogind-file-systems' by extension." 

This reverts commit 17073dafc5.
This commit is contained in:
Ludovic Courtès 2016-09-01 14:00:39 +02:00
parent 5fd66a37d5
commit 38c2b50354
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/services/desktop.scm
View File

@ -27,6 +27,8 @@
#:use-module (gnu services avahi) #:use-module (gnu services avahi)
#:use-module (gnu services xorg) #:use-module (gnu services xorg)
#:use-module (gnu services networking) #:use-module (gnu services networking)
#:use-module ((gnu system file-systems)
#:select (%elogind-file-systems))
#:use-module (gnu system shadow) #:use-module (gnu system shadow)
#:use-module (gnu system pam) #:use-module (gnu system pam)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
@ -760,7 +762,11 @@ seats.)"
;; Extend PAM with pam_elogind.so. ;; Extend PAM with pam_elogind.so.
(service-extension pam-root-service-type (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))) (define* (elogind-service #:key (config (elogind-configuration)))
"Return a service that runs the @command{elogind} login and seat management "Return a service that runs the @command{elogind} login and seat management

1
gnu/system/file-systems.scm
View File

@ -257,7 +257,6 @@ TARGET in the other system."
(append (list %pseudo-terminal-file-system (append (list %pseudo-terminal-file-system
%shared-memory-file-system %shared-memory-file-system
%immutable-store) %immutable-store)
%elogind-file-systems
%control-groups)) %control-groups))
;; File systems for Linux containers differ from %base-file-systems in that ;; File systems for Linux containers differ from %base-file-systems in that