units: in order to make the default services parseable by GKeyFile, merge repeated...

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

diff --git a/units/fedora/halt.service b/units/fedora/halt.service
index ff498e437505609e31391a7f2775b399f54dd7d0..106ac6b691f01b1f74c4849120a58227d8475b52 100644 (file)
--- a/units/fedora/halt.service
+++ b/units/fedora/halt.service
@@ -7,13 +7,13 @@
 
 [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
+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
+Environment=INIT_HALT=HALT RUNLEVEL=0
 ExecStart=/etc/init.d/halt start