diff options
| author | Colin Guthrie <colin@mageia.org> | 2012-07-02 09:15:52 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-07-02 11:50:54 +0200 |
| commit | 067e1f73e89d8e0df3d5496206f68e58bb25e5a9 (patch) | |
| tree | 22d626313035f21e8ffea4f0906af9ef12a39d65 | |
| parent | 931974af6bbad8b79cbee7e41f98954758016fcc (diff) | |
| download | systemd-067e1f73e89d8e0df3d5496206f68e58bb25e5a9.tar.gz | |
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.
| -rw-r--r-- | units/mageia/prefdm.service | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/units/mageia/prefdm.service b/units/mageia/prefdm.service index c85a7a93a8..db41294b29 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 |