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 c85a7a93a8318337a931e1eefde90bcc0750e4f3..db41294b29b0b1966269be4f11c4ae833b24f1d9 100644 (file)
--- 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