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=.

diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in
index d914553d2827f3a7a6d08d34715ed0c6a7344fb2..45e1ceb25cc25618ac22dc3d7073eb049a269c30 100644 (file)
--- 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/