X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Ffedora%2Fprefdm.service;h=51da6c77f1faa0a56f5e404b1b4a434a0bf7477a;hb=edcf89bebe6997b9ff47b7b32c0563ff9797dfb2;hp=6fcd9752e37530e330eb7f6f90ad4334ec203522;hpb=dfca381db341205b7a68f40ef2b7550ac6972cab;p=elogind.git

diff --git a/units/fedora/prefdm.service b/units/fedora/prefdm.service
index 6fcd9752e..51da6c77f 100644
--- a/units/fedora/prefdm.service
+++ b/units/fedora/prefdm.service
@@ -1,16 +1,21 @@
 #  This file is part of systemd.
 #
 #  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 
 [Unit]
 Description=Display Manager
-Before=graphical.target
-After=basic.target syslog.target messagebus.service haldaemon.service
-Conflicts=shutdown.target
+After=livesys-late.service rc-local.service systemd-user-sessions.service
+
+# On Fedora gdm/X11 is on tty1. We explicitly cancel the getty here to
+# avoid any races around that.
+Conflicts=getty@tty1.service plymouth-quit.service
+After=getty@tty1.service plymouth-quit.service
 
 [Service]
 ExecStart=/etc/X11/prefdm -nodaemon
-Type=simple
+Restart=always
+RestartSec=0
+IgnoreSIGPIPE=no