X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Ffedora%2Fprefdm.service;h=e7bd1231f80a4ca583a9ce55c807cf709c590864;hp=6ee35031d9de1e17d856e344972515b7a7b94618;hb=c1d6bc0e5373cec58821c3cba59a6df8de161e27;hpb=5e6afdd3d359fc42de7ac432243e98673577e81f

diff --git a/units/fedora/prefdm.service b/units/fedora/prefdm.service
index 6ee35031d..e7bd1231f 100644
--- a/units/fedora/prefdm.service
+++ b/units/fedora/prefdm.service
@@ -1,27 +1,20 @@
 #  This file is part of systemd.
 #
-#  Copyright 2010 Lennart Poettering
-#
 #  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
 #  (at your option) any later version.
-#
-#  systemd is distributed in the hope that it will be useful, but
-#  WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#  General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-# See systemd.special(7) for details
 
 [Unit]
 Description=Display Manager
-Before=graphical.target
-After=basic.target syslog.target messagebus.service haldaemon.service
+After=syslog.target 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