diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-08-22 08:16:37 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-08-22 08:16:37 -0400 |
| commit | 17073dafc59d62fb8cbb8b94d61d3ecc488ac59f (patch) | |
| tree | c9301108e58b16bfadf3e5bcd0646a321a560420 /gnu | |
| parent | 5f2a7f4fcb2f29aa79cdf7d276b7220281319ae0 (diff) | |
| download | patches-17073dafc59d62fb8cbb8b94d61d3ecc488ac59f.tar patches-17073dafc59d62fb8cbb8b94d61d3ecc488ac59f.tar.gz | |
Revert "services: elogind: Provide '%elogind-file-systems' by extension."
This reverts commit 3cf319a3f8e23831960a0f1320122cc514188a37.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/services/desktop.scm | 8 | ||||
| -rw-r--r-- | gnu/system/file-systems.scm | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index df93bc8e10..bf21707bfe 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -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 diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 0dc472e3c7..116e2813e8 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -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 |