[systemd-commits] 2 commits - Makefile.am units/systemd-networkd.service.in

[Tom Gundersen]

 Makefile.am                       |    4 +---
 units/systemd-networkd.service.in |    3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit ca1a3847695d02ebe62007d8f335f23d3fe04638
Author: Tom Gundersen <teg at jklm.no>
Date:   Fri Feb 21 14:20:14 2014 +0100

    install: enable networkd by default
    
    This treats it similarly to getty at tty1.service and remote-fs.target, which can be
    enabled/disabled, but defaults to enabled.

diff --git a/Makefile.am b/Makefile.am
index 8099acd..f6c22bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4745,6 +4745,7 @@ USER_UNIT_ALIASES += \
 
 GENERAL_ALIASES += \
 	$(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
+	$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \
 	$(systemunitdir)/getty at .service $(pkgsysconfdir)/system/getty.target.wants/getty at tty1.service \
 	$(pkgsysconfdir)/user $(sysconfdir)/xdg/systemd/user \
 	../system-services/org.freedesktop.systemd1.service $(dbussessionservicedir)/org.freedesktop.systemd1.service

commit c4a0b20c7a3043a6691ca23d4a1a7c15b5082a03
Author: Jason A. Donenfeld <Jason at zx2c4.com>
Date:   Fri Feb 21 04:38:17 2014 +0100

    install: do not statically enable systemd-networkd
    
    [tomegun: pruned the commit message as not to contradict the follow-up commit]

diff --git a/Makefile.am b/Makefile.am
index c5724dc..8099acd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3955,9 +3955,6 @@ systemd_networkd_LDADD = \
 nodist_systemunit_DATA += \
 	units/systemd-networkd.service
 
-MULTI_USER_TARGET_WANTS += \
-	systemd-networkd.service
-
 test_network_SOURCES = \
 	src/network/test-network.c \
 	src/network/networkd.h \
diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in
index 835c07d..ca40691 100644
--- a/units/systemd-networkd.service.in
+++ b/units/systemd-networkd.service.in
@@ -20,3 +20,6 @@ Restart=always
 RestartSec=0
 ExecStart=@rootlibexecdir@/systemd-networkd
 WatchdogSec=1min
+
+[Install]
+WantedBy=multi-user.target