From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 3 Aug 2010 21:58:23 +0000 (+0200)
Subject: units: make sure that prefdm wins over the getty if both are pulled in
X-Git-Tag: v5~4
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=14a35a84fa8550f579ba0769f81ea7f4ab5c0bcf

units: make sure that prefdm wins over the getty if both are pulled in
---

diff --git a/units/graphical.target.m4 b/units/graphical.target.m4
index 468770a55..3fb152634 100644
--- a/units/graphical.target.m4
+++ b/units/graphical.target.m4
@@ -14,8 +14,11 @@ After=multi-user.target
 Conflicts=rescue.target
 m4_dnl
 m4_ifdef(`TARGET_FEDORA',
-m4_dnl On Fedora Runlevel 5 is graphical login
+# On Fedora Runlevel 5 is graphical login
 Names=runlevel5.target
+# Pull in prefdm via requires, to make sure when it conflicts with
+# getty@tty1.service it takes precedence.
+Requires=prefdm.service
 )m4_dnl
 m4_ifdef(`TARGET_SUSE',
 Names=runlevel5.target