summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2014-02-21 04:38:17 +0100
committerTom Gundersen <teg@jklm.no>2014-02-21 14:37:53 +0100
commitc4a0b20c7a3043a6691ca23d4a1a7c15b5082a03 (patch)
tree058d9ae18a09598b487febf0d3dc5165a9518159
parent9ac441c0f40a10a6c498398e5876a5256b833e31 (diff)
install: do not statically enable systemd-networkd
[tomegun: pruned the commit message as not to contradict the follow-up commit]
-rw-r--r--Makefile.am3
-rw-r--r--units/systemd-networkd.service.in3
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index c5724dcc7..8099acd58 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3955,9 +3955,6 @@ systemd_networkd_LDADD = \
3955nodist_systemunit_DATA += \ 3955nodist_systemunit_DATA += \
3956 units/systemd-networkd.service 3956 units/systemd-networkd.service
3957 3957
3958MULTI_USER_TARGET_WANTS += \
3959 systemd-networkd.service
3960
3961test_network_SOURCES = \ 3958test_network_SOURCES = \
3962 src/network/test-network.c \ 3959 src/network/test-network.c \
3963 src/network/networkd.h \ 3960 src/network/networkd.h \
diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in
index 835c07ddc..ca40691f5 100644
--- a/units/systemd-networkd.service.in
+++ b/units/systemd-networkd.service.in
@@ -20,3 +20,6 @@ Restart=always
20RestartSec=0 20RestartSec=0
21ExecStart=@rootlibexecdir@/systemd-networkd 21ExecStart=@rootlibexecdir@/systemd-networkd
22WatchdogSec=1min 22WatchdogSec=1min
23
24[Install]
25WantedBy=multi-user.target