X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Ffedora%2Fhalt.service;h=50373d48b6455193774302a72f992be6f749278f;hb=1f812feafb4b98d5cfa2934886bbdd43325780bb;hp=acc47b503dd667e05a001430900201c93d7e62d4;hpb=e6aad08ba82e44e88f9186eab30c68ceaf6370a3;p=elogind.git

diff --git a/units/fedora/halt.service b/units/fedora/halt.service
index acc47b503..50373d48b 100644
--- a/units/fedora/halt.service
+++ b/units/fedora/halt.service
@@ -1,27 +1,19 @@
 #  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
 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
 ExecStart=/etc/init.d/halt start