summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-11-18 21:52:26 +0100
committerLennart Poettering <lennart@poettering.net>2010-11-18 21:52:26 +0100
commit8e1bd70d4ce6d3881c1df6a6482643a2b3a69bb1 (patch)
treef4d8acede8d7ca5cdc53bf74ae2af7d80bfc60a9 /units
parent40f9afa72117d928ddf3f8887026c74e07f09deb (diff)
sysctl: implement native sysctl tool to support Debian-style /etc/sysctl.d
Diffstat (limited to 'units')
-rw-r--r--units/.gitignore1
-rw-r--r--units/systemd-sysctl.service.in (renamed from units/sysctl.service)4
2 files changed, 3 insertions, 2 deletions
diff --git a/units/.gitignore b/units/.gitignore
index 419838b677..008446d4bb 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -1,3 +1,4 @@
+systemd-sysctl.service
systemd-ask-password-console.service
rescue.service
systemd-ask-password-plymouth.service
diff --git a/units/sysctl.service b/units/systemd-sysctl.service.in
index ba5626a3a8..af3ba88e29 100644
--- a/units/sysctl.service
+++ b/units/systemd-sysctl.service.in
@@ -12,9 +12,9 @@ Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service
Before=basic.target shutdown.target
ConditionPathExists=/etc/sysctl.conf
+ConditionDirectoryNotEmpty=/etc/sysctl.d
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/sbin/sysctl -e -q -p /etc/sysctl.conf
-StandardOutput=syslog
+ExecStart=@rootlibexecdir@/systemd-sysctl