[systemd-commits] 2 commits - configure.ac units/mageia

[Lennart Poettering]

 configure.ac                |    2 +-
 units/mageia/prefdm.service |   15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit fbf5b12653e29674b1e85c73d446b13ac3a15b38
Author: Colin Guthrie <colin at mageia.org>
Date:   Mon Jul 2 09:15:53 2012 +0100

    mageia: Correct usage of M4_DEFINES vs. M4_DISTRO_FLAG.
    
    This seems to have been a problem since mageia support was merged,
    as upstream had changed how this bit worked without us realising.

diff --git a/configure.ac b/configure.ac
index e0a2526..5f0b225 100644
--- a/configure.ac
+++ b/configure.ac
@@ -587,7 +587,7 @@ case $with_distro in
         mageia)
                 SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
                 AC_DEFINE(TARGET_MAGEIA, [], [Target is Mageia])
-                M4_DISTRO_FLAG=-DTARGET_MAGEIA=1
+                M4_DEFINES=-DTARGET_MAGEIA=1
                 ;;
         other)
                 ;;

commit 067e1f73e89d8e0df3d5496206f68e58bb25e5a9
Author: Colin Guthrie <colin at mageia.org>
Date:   Mon Jul 2 09:15:52 2012 +0100

    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 c85a7a9..db41294 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 at tty1.service plymouth-quit.service
+After=getty at tty1.service plymouth-quit.service
 
 [Service]
-ExecStart=/etc/X11/prefdm
-Type=forking
+ExecStart=/etc/X11/prefdm -nodaemon
 Restart=always
 RestartSec=0
+IgnoreSIGPIPE=no