diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-05-16 19:44:22 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-05-16 19:48:25 +0200 |
| commit | 2dcf7ec6ec0c28297311108acba119cd6e055e64 (patch) | |
| tree | 1af3869990bd995f5826e7387887bfc73d54fd5e /Makefile.am | |
| parent | d4920165fe753751aaa274fdc568927d26284eea (diff) | |
networkd: manager - read fallback DNS servers from config file
We will still use the compiled-in defaults if no DNS entry exists in the config file.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index ddfec1bde..f6c195b26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4223,7 +4223,8 @@ libsystemd_networkd_core_la_SOURCES = \ nodist_libsystemd_networkd_core_la_SOURCES = \ src/network/networkd-network-gperf.c \ - src/network/networkd-netdev-gperf.c + src/network/networkd-netdev-gperf.c \ + src/network/networkd-gperf.c libsystemd_networkd_core_la_LIBADD = \ libudev-internal.la \ @@ -4232,14 +4233,6 @@ libsystemd_networkd_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-shared.la -nodist_systemunit_DATA += \ - units/systemd-networkd.service \ - units/systemd-networkd-wait-online.service - -GENERAL_ALIASES += \ - $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \ - $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service - rootlibexec_PROGRAMS += \ systemd-networkd-wait-online @@ -4269,15 +4262,30 @@ test_network_LDADD = \ tests += \ test-network +nodist_systemunit_DATA += \ + units/systemd-networkd.service \ + units/systemd-networkd-wait-online.service + +GENERAL_ALIASES += \ + $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \ + $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service + +nodist_pkgsysconf_DATA += \ + src/network/networkd.conf + EXTRA_DIST += \ src/network/networkd-network-gperf.gperf \ src/network/networkd-netdev-gperf.gperf \ + src/network/networkd-gperf.gperf \ units/systemd-networkd.service.in \ - units/systemd-networkd-wait-online.service.in + units/systemd-networkd-wait-online.service.in \ + src/network/networkd.conf.in CLEANFILES += \ src/network/networkd-network-gperf.c \ - src/network/networkd-netdev-gperf.c + src/network/networkd-netdev-gperf.c \ + src/network/networkd-gperf.c \ + src/network/networkd.conf endif # ------------------------------------------------------------------------------ @@ -4831,7 +4839,8 @@ substitutions = \ '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \ '|PYTHON=$(PYTHON)|' \ '|PYTHON_BINARY=$(PYTHON_BINARY)|' \ - '|NTP_SERVERS=$(NTP_SERVERS)|' + '|NTP_SERVERS=$(NTP_SERVERS)|' \ + '|DNS_SERVERS=$(DNS_SERVERS)|' SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ |