units: enable sysctl by default

diff --git a/Makefile.am b/Makefile.am
index e73741f853de2ee3c4ab993a60355ca0e4e380a3..d233da6ca58dba54e9ad5f807589990f893f5787 100644 (file)
--- 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 3186cc0f63b22e21066df3f12af5cb4f52962b25..2464a079186b94a22a7cea3cf021e733035c2dd6 100644 (file)
--- 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