cgroup: after killing cgroup processes, ensure the group is really dead gone. wait...

[elogind.git] / units / multi-user.target.m4

diff --git a/units/multi-user.target.m4 b/units/multi-user.target.m4
index cf290e7cf59d9b33df943fdfa5224246c7b3a79b..8d458c7679c5a76c9eb6099b5d1924269fc5aeab 100644 (file)
--- a/units/multi-user.target.m4
+++ b/units/multi-user.target.m4
@@ -10,8 +10,8 @@
 [Unit]
 Description=Multi-User
 Requires=basic.target
-Conflicts=rescue.target
-After=basic.target rescue.target
+Conflicts=rescue.service rescue.target
+After=basic.target rescue.service rescue.target
 m4_dnl
 m4_ifdef(`TARGET_FEDORA',
 m4_dnl On Fedora Runlevel 3 is multi-user
@@ -21,9 +21,11 @@ m4_ifdef(`TARGET_SUSE',
 Names=runlevel3.target
 )m4_dnl
 m4_ifdef(`TARGET_DEBIAN',
-m4_dnl On Debian Runlevel 2, 3, 4 and 5 are multi-user
+m4_ifdef(`TARGET_UBUNTU',
+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
 AllowIsolate=yes
 
 [Install]