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 ff498e437505609e31391a7f2775b399f54dd7d0..a6c4786a8b91ce6ab21502f9a529a2db8e1fbb9e 100644 (file)
--- a/units/fedora/halt.service
+++ b/units/fedora/halt.service
@@ -7,13 +7,13 @@
 
 [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
+DefaultDependencies=no
+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