chiark / gitweb /
Revert "units: ignore systemd-sysctl on shutdown"
authorLennart Poettering <lennart@poettering.net>
Sat, 23 Mar 2013 02:10:41 +0000 (03:10 +0100)
committerLennart Poettering <lennart@poettering.net>
Sat, 23 Mar 2013 02:10:41 +0000 (03:10 +0100)
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=.

units/systemd-sysctl.service.in

index d914553..45e1ceb 100644 (file)
@@ -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/