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

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

diff --git a/units/arch/halt.service b/units/arch/halt.service
index 445ca48d4400b0fc2469cb914fdc13efc7b13f64..dbfc22878777e7ae7d4b77ce6442136b9950f110 100644 (file)
--- a/units/arch/halt.service
+++ b/units/arch/halt.service
@@ -7,12 +7,13 @@
 
 [Unit]
 Description=Halt
-Requires=shutdown.target
-After=shutdown.target
-Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
+DefaultDependencies=no
+Requires=shutdown.target umount.target
+After=shutdown.target umount.target
 
 [Service]
-Type=finish
+Type=oneshot
 ValidNoProcess=yes
 Environment=RUNLEVEL=0
 ExecStart=/etc/rc.shutdown
+StandardOutput=tty