From f057408c9c3b54b6eeb96cd9f0a1333f30610614 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 12 Jul 2010 23:49:20 +0200
Subject: units: introduce emergency.target

---
 units/multi-user.target.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'units/multi-user.target.m4')

diff --git a/units/multi-user.target.m4 b/units/multi-user.target.m4
index 010e7d8474..323ba01a60 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.target shutdown.target
+After=basic.target rescue.target
 m4_dnl
 m4_ifdef(`TARGET_FEDORA',
 m4_dnl On Fedora Runlevel 3 is multi-user
-- 
cgit v1.2.3-54-g00ecf