diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-09-01 14:00:39 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-09-01 14:57:03 +0200 |
| commit | 38c2b503545c7f214ff7670bd9f62bdebb59186d (patch) | |
| tree | 42e7479ac774adef2a8a9ef78b0feb2fb8a2343a | |
| parent | 5fd66a37d58aa13091134d5e6e5f8c62f404ebfe (diff) | |
| download | patches-38c2b503545c7f214ff7670bd9f62bdebb59186d.tar patches-38c2b503545c7f214ff7670bd9f62bdebb59186d.tar.gz | |
Reinstate "services: elogind: Provide '%elogind-file-systems' by extension."
This reverts commit 17073dafc59d62fb8cbb8b94d61d3ecc488ac59f.
| -rw-r--r-- | gnu/services/desktop.scm | 8 | ||||
| -rw-r--r-- | gnu/system/file-systems.scm | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index bf21707bfe..df93bc8e10 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -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 diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 116e2813e8..0dc472e3c7 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -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 |