X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Fsuse%2Fhalt.service;h=d826ca3e22d846832e1221ca6862e81376ce3f80;hp=fbcf154f578a4d5205babc52faa67222c1a09a69;hb=d48141ba0bed2866e05261cf06f0a6adfb11f349;hpb=af65a09126e216d468592f069aee50dfe0382d3a

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