summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-03-23 03:10:41 +0100
committerLennart Poettering <lennart@poettering.net>2013-03-23 03:10:41 +0100
commit0debd2bf2f92d4e8f7a3e520c6c1d522e5058929 (patch)
tree5bc9b27c80c70fe7478fbd8b51872d4c333cf68e /units
parent4ad61fd1806dde23d2c99043b4bed91a196d2c82 (diff)
Revert "units: ignore systemd-sysctl on shutdown"
This reverts commit faeffa73a81ab5b59acfadeb571431fb0e42af70. There isn't really much point in dropping the Conflicts= since shutting down this service is basically free as it doesn't have anything running. Also, the patch was incomplete, because shutdown.target was still listed in Before=.
Diffstat (limited to 'units')
-rw-r--r--units/systemd-sysctl.service.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in
index d914553d28..45e1ceb25c 100644
--- a/units/systemd-sysctl.service.in
+++ b/units/systemd-sysctl.service.in
@@ -9,6 +9,7 @@
Description=Apply Kernel Variables
Documentation=man:systemd-sysctl.service(8) man:sysctl.d(5)
DefaultDependencies=no
+Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service
Before=sysinit.target shutdown.target
ConditionPathIsReadWrite=/proc/sys/