diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2019-01-09 10:48:42 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2019-01-09 10:52:41 +0200 |
| commit | 0e289672503a4e1599ef826d49f2fa5575081942 (patch) | |
| tree | cdaec28207956090b7cebff805135754dcb22f06 /gnu/services | |
| parent | 0109b89c5834b5374f248dc3681702180013f41f (diff) | |
| parent | 6df4d8338d2bf94ab729e3b12e42ace0a06687ae (diff) | |
| download | guix-0e289672503a4e1599ef826d49f2fa5575081942.tar.gz guix-0e289672503a4e1599ef826d49f2fa5575081942.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/xorg.scm | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index ea8433af3a..b3c24746d1 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> +;;; Copyright © 2018 Timothy Sample <samplet@ngyro.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -625,7 +626,6 @@ makes the good ol' XlockMore usable." gdm-configuration? (gdm gdm-configuration-gdm (default gdm)) (allow-empty-passwords? gdm-configuration-allow-empty-passwords? (default #t)) - (allow-root? gdm-configuration-allow-root? (default #t)) (auto-login? gdm-configuration-auto-login? (default #f)) (default-user gdm-configuration-default-user (default #f)) (x-server gdm-configuration-x-server)) @@ -680,18 +680,15 @@ makes the good ol' XlockMore usable." (auth (list (pam-entry (control "required") (module "pam_permit.so"))))) - (unix-pam-service - "gdm-password" - #:allow-empty-passwords? (gdm-configuration-allow-empty-passwords? config) - #:allow-root? (gdm-configuration-allow-root? config)))) + (unix-pam-service "gdm-password" + #:allow-empty-passwords? + (gdm-configuration-allow-empty-passwords? config)))) (define (gdm-shepherd-service config) (list (shepherd-service (documentation "Xorg display server (GDM)") (provision '(xorg-server)) (requirement '(dbus-system user-processes host-name udev)) - ;; While this service isn't working properly, turn off auto-start. - (auto-start? #f) (start #~(lambda () (fork+exec-command (list #$(file-append (gdm-configuration-gdm config) |