diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2014-02-21 16:36:59 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-02-21 19:24:17 +0100 |
| commit | a2fef7701ba2e0179ec2217fd562b7345b15735c (patch) | |
| tree | f7cfc7f927a800fcf8335f16b78a8ca1803376c2 /Makefile.am | |
| parent | 96197df081a16bec192a6cfb8f19674ca58f4835 (diff) | |
install: networkd.service depend on !--disable
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.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 1fc23f72f8..88d0ce3d47 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 |