[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Reinstate "services: elogind: Provide '%elogind-file-systems' by
From: |
Ludovic Courtès |
Subject: |
01/02: Reinstate "services: elogind: Provide '%elogind-file-systems' by extension." |
Date: |
Thu, 1 Sep 2016 12:57:33 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit 38c2b503545c7f214ff7670bd9f62bdebb59186d
Author: Ludovic Courtès <address@hidden>
Date: Thu Sep 1 14:00:39 2016 +0200
Reinstate "services: elogind: Provide '%elogind-file-systems' by extension."
This reverts commit 17073dafc59d62fb8cbb8b94d61d3ecc488ac59f.
---
gnu/services/desktop.scm | 8 +++++++-
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 bf21707..df93bc8 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 116e281..0dc472e 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