diff options
Diffstat (limited to 'units')
| -rw-r--r-- | units/getty@.service.m4 | 3 | ||||
| -rw-r--r-- | units/graphical.target.m4 | 3 | ||||
| -rw-r--r-- | units/mandriva/prefdm.service | 24 | ||||
| -rw-r--r-- | units/multi-user.target.m4 | 3 | ||||
| -rw-r--r-- | units/rescue.service.m4 | 8 | ||||
| -rw-r--r-- | units/serial-getty@.service.m4 | 3 |
6 files changed, 43 insertions, 1 deletions
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 index d282912274..8e1f250ad0 100644 --- a/units/getty@.service.m4 +++ b/units/getty@.service.m4 @@ -21,6 +21,9 @@ After=local.service m4_ifdef(`TARGET_ALTLINUX', After=rc-local.service )m4_dnl +m4_ifdef(`TARGET_MANDRIVA', +After=rc-local.service +)m4_dnl # If additional gettys are spawned during boot then we should make # sure that this is synchronized before getty.target, even though diff --git a/units/graphical.target.m4 b/units/graphical.target.m4 index e2750c8640..1931d7f986 100644 --- a/units/graphical.target.m4 +++ b/units/graphical.target.m4 @@ -23,6 +23,9 @@ Names=runlevel5.target m4_ifdef(`TARGET_ALTLINUX', Names=runlevel5.target )m4_dnl +m4_ifdef(`TARGET_MANDRIVA', +Names=runlevel5.target +)m4_dnl AllowIsolate=yes [Install] diff --git a/units/mandriva/prefdm.service b/units/mandriva/prefdm.service new file mode 100644 index 0000000000..43b505db89 --- /dev/null +++ b/units/mandriva/prefdm.service @@ -0,0 +1,24 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +[Unit] +Description=Display Manager +After=syslog.target livesys-late.service rc-local.service systemd-user-sessions.service +After=network.target acpid.service fs.service haldaemon.service + +# Do not stop plymouth, it is done in prefdm if required +Conflicts=plymouth-quit.service +After=plymouth-quit.service + +# Hide SysV script +Names=dm.service + +[Service] +ExecStart=/etc/X11/prefdm +Type=forking +Restart=always +RestartSec=0 diff --git a/units/multi-user.target.m4 b/units/multi-user.target.m4 index 9df0142446..51e7b6664c 100644 --- a/units/multi-user.target.m4 +++ b/units/multi-user.target.m4 @@ -29,6 +29,9 @@ m4_dnl On Debian/Ubuntu Runlevel 2, 3, 4 and 5 are multi-user Names=runlevel2.target runlevel3.target runlevel4.target runlevel5.target )m4_dnl )m4_dnl +m4_ifdef(`TARGET_MANDRIVA', +Names=runlevel3.target +)m4_dnl AllowIsolate=yes [Install] diff --git a/units/rescue.service.m4 b/units/rescue.service.m4 index 2a0d3280ec..8b42e9f690 100644 --- a/units/rescue.service.m4 +++ b/units/rescue.service.m4 @@ -13,6 +13,9 @@ DefaultDependencies=no Conflicts=shutdown.target After=basic.target Before=shutdown.target +m4_ifdef(`TARGET_MANDRIVA', +`# Hide SysV script +Names=single.service') [Service] Environment=HOME=/root @@ -22,7 +25,10 @@ ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D t m4_ifdef(`TARGET_FEDORA', `EnvironmentFile=/etc/sysconfig/init ExecStart=-/bin/bash -c "exec ${SINGLE}"', -`ExecStart=-/sbin/sulogin') +m4_ifdef(`TARGET_MANDRIVA', +`EnvironmentFile=/etc/sysconfig/init +ExecStart=-/bin/bash -c "exec ${SINGLE}"', +`ExecStart=-/sbin/sulogin')) ExecStopPost=-/bin/systemctl --fail default StandardInput=tty-force KillMode=process-group diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4 index 2b3c8edd57..d42330a1ad 100644 --- a/units/serial-getty@.service.m4 +++ b/units/serial-getty@.service.m4 @@ -21,6 +21,9 @@ After=local.service m4_ifdef(`TARGET_ALTLINUX', After=rc-local.service )m4_dnl +m4_ifdef(`TARGET_MANDRIVA', +After=rc-local.service +)m4_dnl # If additional gettys are spawned during boot then we should make # sure that this is synchronized before getty.target, even though |