X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Fbasic.target.m4;h=537ad8daf7a6536d63f27e0de1f7506c229d85f4;hb=65b0095b1c126eee9f8d44f81593edb6ff601356;hp=437e33d5e64cfadc42c0fc65d704caaabf592c1b;hpb=5e6afdd3d359fc42de7ac432243e98673577e81f;p=elogind.git

diff --git a/units/basic.target.m4 b/units/basic.target.m4
index 437e33d5e..537ad8daf 100644
--- a/units/basic.target.m4
+++ b/units/basic.target.m4
@@ -1,19 +1,9 @@
 #  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
 
@@ -21,8 +11,11 @@
 Description=Basic System
 Requires=local-fs.target swap.target sockets.target
 After=local-fs.target swap.target sockets.target
-
+Conflicts=emergency.service
+OnlyByDependency=yes
+m4_dnl
 m4_ifdef(`TARGET_FEDORA',
-# Hook in Fedora's /etc/rc.d/rc.sysinit
+m4_dnl Hook in Fedora's /etc/rc.d/rc.sysinit
 Requires=sysinit.service
-After=sysinit.service)
+After=sysinit.service
+)m4_dnl