X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Fbasic.target.m4;h=5053df41849d0ab51ab6af16ad24c48d14626ad1;hb=50321ee3ef31b540e78bb767c3935763b96ea581;hp=c31a8f681ef262760de01d2995e48c6a8b043f9c;hpb=bd3d19a4ea3b007bea4c94213cafd5dc37ce7a3d;p=elogind.git

diff --git a/units/basic.target.m4 b/units/basic.target.m4
index c31a8f681..5053df418 100644
--- a/units/basic.target.m4
+++ b/units/basic.target.m4
@@ -21,6 +21,7 @@
 Description=Basic System
 Requires=local-fs.target swap.target sockets.target
 After=local-fs.target swap.target sockets.target
+Conflicts=emergency.service
 m4_dnl
 m4_ifdef(`TARGET_FEDORA',
 m4_dnl Hook in Fedora's /etc/rc.d/rc.sysinit