[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Revert "services: elogind: Provide '%elogind-file-systems' by ext
From: |
Mark H. Weaver |
Subject: |
01/01: Revert "services: elogind: Provide '%elogind-file-systems' by extension." |
Date: |
Mon, 22 Aug 2016 12:18:02 +0000 (UTC) |
mhw pushed a commit to branch master
in repository guix.
commit 17073dafc59d62fb8cbb8b94d61d3ecc488ac59f
Author: Mark H Weaver <address@hidden>
Date: Mon Aug 22 08:16:37 2016 -0400
Revert "services: elogind: Provide '%elogind-file-systems' by extension."
This reverts commit 3cf319a3f8e23831960a0f1320122cc514188a37.
---
gnu/services/desktop.scm | 8 +-------
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 df93bc8..bf21707 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 0dc472e..116e281 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