[gdm/gnome-3-14] systemd: make sure to only start plymouth is started

[Ray Strode <halfline src gnome org>]

commit 8b016b89d1759a088883d2eb90c19158e80d713b
Author: Ray Strode <rstrode redhat com>
Date:   Fri Mar 6 15:36:29 2015 -0500

    systemd: make sure to only start plymouth is started
    
    This commit makes sure gdm doesn't start in parallel with plymouth,
    which could lead to plymouth activating after X is started.
    
    Furthermore, GDM is replacing getty tty1 service and
    plymouth-quit.service, so it needs to have the same dependencies
    as them.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=89475

 data/gdm.service.in |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/data/gdm.service.in b/data/gdm.service.in
index bfc5bb9..4ffcb29 100644
--- a/data/gdm.service.in
+++ b/data/gdm.service.in
@@ -1,7 +1,19 @@
 [Unit]
 Description=GNOME Display Manager
-Conflicts=getty tty@GDM_INITIAL_VT  service plymouth-quit.service
-After=systemd-user-sessions.service getty tty@GDM_INITIAL_VT  service plymouth-quit.service
+
+# replaces the getty
+Conflicts=getty tty@GDM_INITIAL_VT  service
+After=getty tty@GDM_INITIAL_VT  service
+
+# replaces plymouth-quit since it quits plymouth on its own
+Conflicts=plymouth-quit.service
+After=plymouth-quit.service
+
+# Needs all the dependencies of the services it's replacing
+# pulled from getty  service and plymouth-quit.service
+# (except for plymouth-quit-wait.service since it waits until
+# plymouth is quit, which we do)
+After=rc-local.service plymouth-start.service systemd-user-sessions.service
 
 # GDM takes responsibility for stopping plymouth, so if it fails
 # for any reason, make sure plymouth still stops