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 a49cfb9f555db22e4c83b52384558f4823b236fd..8d458c7679c5a76c9eb6099b5d1924269fc5aeab 100644 (file)
--- a/units/multi-user.target.m4
+++ b/units/multi-user.target.m4
@@ -1,29 +1,32 @@
 #  This file is part of systemd.
 #
-#  Copyright 2010 Lennart Poettering
-#
 #  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.
-#
-#  systemd is distributed in the hope that it will be useful, but
-#  WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#  General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 # See systemd.special(7) for details
 
 [Unit]
 Description=Multi-User
 Requires=basic.target
-After=basic.target
-Conflicts=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
 Names=runlevel3.target
 )m4_dnl
+m4_ifdef(`TARGET_SUSE',
+Names=runlevel3.target
+)m4_dnl
+m4_ifdef(`TARGET_DEBIAN',
+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]
+Alias=default.target