It doesn't make any sense to symlink this unit file into /etc when the
unit file itself isn't even installed, with --disable-networkd. This
moves the GENERAL_ALIASES logic into the right "if" block.
---
Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 1fc23f7..88d0ce3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3955,6 +3955,9 @@ systemd_networkd_LDADD = \
nodist_systemunit_DATA += \
units/systemd-networkd.service
+GENERAL_ALIASES += \
+ $(systemunitdir)/systemd-networkd.service
$(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service
+
test_network_SOURCES = \
src/network/test-network.c \
src/network/networkd.h \
@@ -4745,7 +4748,6 @@ 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@.service
$(pkgsysconfdir)/system/getty.target.wants/getty@tty1.service \
$(pkgsysconfdir)/user $(sysconfdir)/xdg/systemd/user \
../system-services/org.freedesktop.systemd1.service
$(dbussessionservicedir)/org.freedesktop.systemd1.service
--
1.8.5.4
_______________________________________________
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
