[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/07: services: gdm: Ensure /var/lib/gdm is owned by "gdm".
From: |
guix-commits |
Subject: |
01/07: services: gdm: Ensure /var/lib/gdm is owned by "gdm". |
Date: |
Sat, 21 Sep 2019 10:49:02 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit a43e9157ef479e94c19951cc9d228cf153bf78ee
Author: Ludovic Courtès <address@hidden>
Date: Fri Sep 20 21:33:22 2019 +0200
services: gdm: Ensure /var/lib/gdm is owned by "gdm".
Fixes <https://bugs.gnu.org/37423>.
Reported by Jan <address@hidden>.
* gnu/services/xorg.scm (%gdm-activation): New variable.
(gdm-service-type)[extensions]: Add 'activation-service-type'.
---
gnu/services/xorg.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 06d72b5..1d55e38 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -773,6 +773,27 @@ the GNOME desktop environment.")
(home-directory "/var/lib/gdm")
(shell (file-append shadow "/sbin/nologin")))))
+(define %gdm-activation
+ ;; Ensure /var/lib/gdm is owned by the "gdm" user. This is normally the
+ ;; case but could be wrong if the "gdm" user was created, then removed, and
+ ;; then recreated under a different UID/GID: <https://bugs.gnu.org/37423>.
+ (with-imported-modules '((guix build utils))
+ #~(begin
+ (use-modules (guix build utils))
+
+ (let* ((gdm (getpwnam "gdm"))
+ (uid (passwd:uid gdm))
+ (gid (passwd:gid gdm))
+ (st (stat "/var/lib/gdm" #f)))
+ ;; Recurse into /var/lib/gdm only if it has wrong ownership.
+ (when (and st
+ (or (not (= uid (stat:uid st)))
+ (not (= gid (stat:gid st)))))
+ (for-each (lambda (file)
+ (chown file uid gid))
+ (find-files "/var/lib/gdm"
+ #:directories? #t)))))))
+
(define dbus-daemon-wrapper
(program-file
"gdm-dbus-wrapper"
@@ -915,6 +936,8 @@ the GNOME desktop environment.")
(extensions
(list (service-extension shepherd-root-service-type
gdm-shepherd-service)
+ (service-extension activation-service-type
+ (const %gdm-activation))
(service-extension account-service-type
(const %gdm-accounts))
(service-extension pam-root-service-type
- branch master updated (5122209 -> 660dbe6), guix-commits, 2019/09/21
- 03/07: services: dovecot: Fix predicate names for free-form fields, guix-commits, 2019/09/21
- 02/07: inferior: Propagate '&store-protocol-error' error conditions., guix-commits, 2019/09/21
- 05/07: gnu: Add python-bibtexparser., guix-commits, 2019/09/21
- 07/07: guix package: '--show' ignores deprecated packages., guix-commits, 2019/09/21
- 01/07: services: gdm: Ensure /var/lib/gdm is owned by "gdm".,
guix-commits <=
- 04/07: gnu: Add autocutsel., guix-commits, 2019/09/21
- 06/07: guix package: Add 'guix show' alias., guix-commits, 2019/09/21