From: Colin Guthrie <colin@mageia.org>
Date: Mon, 2 Jul 2012 08:15:52 +0000 (+0100)
Subject: mageia: Change the unit for prefdm.service to make it work a bit more like Fedora
X-Git-Tag: v186~18
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=067e1f73e89d8e0df3d5496206f68e58bb25e5a9

mageia: Change the unit for prefdm.service to make it work a bit more like Fedora

Do not wait for some of the Fedora units that we have traditionally not
waited for in Mageia or Mandriva before it.
---

diff --git a/units/mageia/prefdm.service b/units/mageia/prefdm.service
index c85a7a93a..db41294b2 100644
--- a/units/mageia/prefdm.service
+++ b/units/mageia/prefdm.service
@@ -7,15 +7,16 @@
 
 [Unit]
 Description=Display Manager
-After=livesys-late.service rc-local.service systemd-user-sessions.service
-After=network.target acpid.service fs.service haldaemon.service
+After=livesys-late.service systemd-user-sessions.service
 
-# Do not stop plymouth, it is done in prefdm if required
-Conflicts=plymouth-quit.service
-After=plymouth-quit.service
+# On Mageia gdm/X11 is on tty1. We explicitly cancel the getty here to
+# avoid any races around that.
+# Do not stop plymouth, it is done in prefdm if required (or left to the dm)
+Conflicts=getty@tty1.service plymouth-quit.service
+After=getty@tty1.service plymouth-quit.service
 
 [Service]
-ExecStart=/etc/X11/prefdm
-Type=forking
+ExecStart=/etc/X11/prefdm -nodaemon
 Restart=always
 RestartSec=0
+IgnoreSIGPIPE=no