diff options
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 3 | ||||
| -rw-r--r-- | meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolved.conf | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index 4f4bbf144a..33678e2345 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc @@ -12,6 +12,7 @@ SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getV file://dnsmasq.conf \ file://dnsmasq-resolvconf.service \ file://dnsmasq-noresolvconf.service \ + file://dnsmasq-resolved.conf \ " inherit pkgconfig update-rc.d systemd @@ -58,6 +59,8 @@ do_install () { else install -m 0644 ${WORKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service fi + install -d ${D}${sysconfdir}/systemd/resolved.conf.d/ + install -m 0644 ${WORKDIR}/dnsmasq-resolved.conf ${D}${sysconfdir}/systemd/resolved.conf.d/ install -m 0755 ${S}/contrib/lease-tools/dhcp_release ${D}${bindir} diff --git a/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolved.conf b/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolved.conf new file mode 100644 index 0000000000..33f4649637 --- /dev/null +++ b/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolved.conf @@ -0,0 +1,3 @@ +# Avoid conflicts between dnsmasq and systemd-resolved about port 53 +[Resolve] +DNSStubListener=no |