aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQi.Chen@windriver.com <Qi.Chen@windriver.com>2019-03-14 13:50:49 +0800
committerKhem Raj <raj.khem@gmail.com>2019-03-14 07:24:03 -0700
commit93c5f470454c0c09d1e04664b4129dbaf4218361 (patch)
tree367a9a6f419e2ba844fa99386b8487721c9f3e66
parent02f05020534af3aae4bce693f44bdb6184c1679f (diff)
downloadmeta-openembedded-93c5f470454c0c09d1e04664b4129dbaf4218361.tar.gz
meta-openembedded-93c5f470454c0c09d1e04664b4129dbaf4218361.tar.bz2
meta-openembedded-93c5f470454c0c09d1e04664b4129dbaf4218361.zip
dnsmasq: avoid conflict with systemd-resolved
Add a drop-in configuration file for systemd-resolved to avoid conflict about port 53. The error message is as below. failed to create listening socket for port 53: Address already in us Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/recipes-support/dnsmasq/dnsmasq.inc3
-rw-r--r--meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolved.conf3
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 4f4bbf144..33678e234 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 000000000..33f464963
--- /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