From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 23 Mar 2013 02:10:41 +0000 (+0100)
Subject: Revert "units: ignore systemd-sysctl on shutdown"
X-Git-Tag: v199~66
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=0debd2bf2f92d4e8f7a3e520c6c1d522e5058929

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 d914553d2..45e1ceb25 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/