X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Fmulti-user.target.m4;h=51e7b6664cfaa4c9ae5a1eb9bee38edcf5c2adce;hp=eb46b2b4ac215bed5f2f6d27aea80c2125e70f7b;hb=1de4d79bf554946f486adf56ed765c5335816f15;hpb=3d88bf660dae270c051c8319bba62c58a50c9d2b

diff --git a/units/multi-user.target.m4 b/units/multi-user.target.m4
index eb46b2b4a..51e7b6664 100644
--- a/units/multi-user.target.m4
+++ b/units/multi-user.target.m4
@@ -10,8 +10,8 @@
 [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
@@ -20,11 +20,19 @@ Names=runlevel3.target
 m4_ifdef(`TARGET_SUSE',
 Names=runlevel3.target
 )m4_dnl
+m4_ifdef(`TARGET_ALTLINUX',
+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
+m4_ifdef(`TARGET_MANDRIVA',
+Names=runlevel3.target
+)m4_dnl
+AllowIsolate=yes
 
 [Install]
 Alias=default.target
-m4_ifdef(`TARGET_FEDORA',
-Alias=runlevel2.target
-Alias=runlevel3.target
-Alias=runlevel4.target
-)m4_dnl