X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Ffedora%2Fhalt.service;h=0c0fa5fa380ac7816ccc8a0d681e08ca7d7aa338;hb=b827a9f97dcc88f4b9e23d656d7325455eb33848;hp=06c588fae6014afad0c95ea3f3427ad661b102a1;hpb=1e3fc6541f92cc1c42ba1b3a7bbe4c8c7b918156;p=elogind.git

diff --git a/units/fedora/halt.service b/units/fedora/halt.service
index 06c588fae..0c0fa5fa3 100644
--- a/units/fedora/halt.service
+++ b/units/fedora/halt.service
@@ -1,28 +1,20 @@
 #  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/>.
 
 [Unit]
 Description=Halt
-Requires=shutdown.target killall.service
+DefaultDependencies=no
+Wants=shutdown.target killall.service
 After=shutdown.target killall.service
+Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
 
 [Service]
 Type=finish
 ValidNoProcess=yes
-Environment=INIT_HALT=HALT
-Environment=RUNLEVEL=0
+Environment=INIT_HALT=HALT RUNLEVEL=0
 ExecStart=/etc/init.d/halt start
+StandardInput=tty