service: rename Type=finish to Type=oneshot and allow multiple ExecStart= lines for...

[elogind.git] / units / fedora / halt.service

diff --git a/units/fedora/halt.service b/units/fedora/halt.service
index 815c8fbdad23428545f8363e6cd760c4f8563047..a6c4786a8b91ce6ab21502f9a529a2db8e1fbb9e 100644 (file)
--- a/units/fedora/halt.service
+++ b/units/fedora/halt.service
@@ -8,13 +8,12 @@
 [Unit]
 Description=Halt
 DefaultDependencies=no
-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
+Requires=shutdown.target umount.target killall.service
+After=shutdown.target umount.target killall.service
 
 [Service]
-Type=finish
+Type=oneshot
 ValidNoProcess=yes
-Environment=INIT_HALT=HALT
-Environment=RUNLEVEL=0
+Environment=INIT_HALT=HALT RUNLEVEL=0
 ExecStart=/etc/init.d/halt start
+StandardOutput=tty