diff options
| author | Tom Gundersen <teg@jklm.no> | 2016-06-24 01:26:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-24 01:26:25 +0200 |
| commit | a2c28c645160b4e9377db4cb40cb9f22141f2dd3 (patch) | |
| tree | 9fbb81747c4d973edec60ab967b0eb818ebbc219 /Makefile.am | |
| parent | de2edc008a612e152f0690d5063d53001c4e13ff (diff) | |
| parent | 4e68ec18669db7175a999f95b6b5b0d1908376c9 (diff) | |
| download | systemd-a2c28c645160b4e9377db4cb40cb9f22141f2dd3.tar.gz | |
Merge pull request #3549 from poettering/resolved-more
resolved: more fixes, among them "systemctl-resolve --status" to see DNS configuration in effect, and a local DNS stub listener on 127.0.0.53
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 02329284f5..dd62affded 100644 --- a/Makefile.am +++ b/Makefile.am @@ -125,6 +125,7 @@ dist_systemunit_DATA_busnames = dist_sysusers_DATA = check_PROGRAMS = check_DATA = +dist_rootlibexec_DATA = tests= manual_tests = TEST_EXTENSIONS = .py @@ -5147,7 +5148,7 @@ systemd_export_LDADD = \ $(ZLIB_LIBS) \ -lbz2 -dist_rootlibexec_DATA = \ +dist_rootlibexec_DATA += \ src/import/import-pubring.gpg nodist_systemunit_DATA += \ @@ -5259,6 +5260,8 @@ systemd_resolved_SOURCES = \ src/resolve/resolved-dns-stream.c \ src/resolve/resolved-dns-trust-anchor.h \ src/resolve/resolved-dns-trust-anchor.c \ + src/resolve/resolved-dns-stub.h \ + src/resolve/resolved-dns-stub.c \ src/resolve/resolved-etc-hosts.h \ src/resolve/resolved-etc-hosts.c \ src/shared/gcrypt-util.c \ @@ -5411,6 +5414,9 @@ EXTRA_DIST += \ units/systemd-resolved.service.m4.in \ src/resolve/resolved.conf.in +dist_rootlibexec_DATA += \ + src/resolve/resolv.conf + # ------------------------------------------------------------------------------ if ENABLE_NETWORKD rootlibexec_PROGRAMS += \ |