From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 21 Sep 2010 19:38:21 +0000 (+0200)
Subject: units: enable sysctl by default
X-Git-Tag: v11~103
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9ccc724990035fd9b2905857a695ade041ab133;p=systemd

units: enable sysctl by default
---

diff --git a/Makefile.am b/Makefile.am
index e73741f8..d233da6c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -990,6 +990,7 @@ install-data-hook:
 			systemd-modules-load.service \
 			systemd-random-seed-load.service \
 			hwclock-load.service \
+			sysctl.service \
 			tmpwatch.timer \
 			tmpwatch.service && \
 		$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
@@ -1001,6 +1002,7 @@ install-data-hook:
 		$(LN_S) ../systemd-modules-load.service && \
 		$(LN_S) ../systemd-random-seed-load.service && \
 		$(LN_S) ../hwclock-load.service && \
+		$(LN_S) ../sysctl.service && \
 		$(LN_S) ../tmpwatch.timer && \
 		$(LN_S) ../tmpwatch.service )
 	( cd $(DESTDIR)$(dbussessionservicedir) && \
diff --git a/units/sysctl.service b/units/sysctl.service
index 3186cc0f..2464a079 100644
--- a/units/sysctl.service
+++ b/units/sysctl.service
@@ -15,6 +15,3 @@ Before=shutdown.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/sbin/sysctl -e -q -p /etc/sysctl.conf
-
-[Install]
-WantedBy=sysinit.target