aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2016-11-21 13:42:35 -0500
committerArmin Kuster <akuster808@gmail.com>2017-01-29 19:28:49 -0500
commit6cedb8409996ec5efb0ba3a14913f368bd517cbd (patch)
treed0f64be47fceee2d28c12b5b95e715bc58007ae5
parent01f4d8df844680633bed5c90509fcb88f132ba3e (diff)
downloadmeta-openembedded-contrib-6cedb8409996ec5efb0ba3a14913f368bd517cbd.tar.gz
meta-openembedded-contrib-6cedb8409996ec5efb0ba3a14913f368bd517cbd.tar.bz2
meta-openembedded-contrib-6cedb8409996ec5efb0ba3a14913f368bd517cbd.zip
dnsmasq: allow for dnsmasq instances to reuse default dnsmasq.conf
By defining 'listen-address' in the global dnsmasq.conf file we prevent other instances of dnsmasq from using the global config as we will get an error that the address is already in use. Instead we pass 'local-service' when we start the main dnsmasq instance which will listen on the loopback address as well as any other local subnets. This will allow the main dnsmasq instance to play nice with other instances we might start for network-manager, libvirt, lxc... Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-networking/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service2
-rw-r--r--meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service2
-rwxr-xr-xmeta-networking/recipes-support/dnsmasq/files/dnsmasq.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta-networking/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service b/meta-networking/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service
index 32f8e59072..0c64fab003 100644
--- a/meta-networking/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service
+++ b/meta-networking/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service
@@ -6,7 +6,7 @@ After=network.target
Type=forking
PIDFile=/run/dnsmasq.pid
ExecStartPre=/usr/bin/dnsmasq --test
-ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d
+ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d --local-service
ExecStop=/bin/kill $MAINPID
ExecReload=/bin/kill -HUP $MAINPID
diff --git a/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service b/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service
index 07b4817a7e..2980f7def6 100644
--- a/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service
+++ b/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service
@@ -6,7 +6,7 @@ After=network.target
Type=forking
PIDFile=/run/dnsmasq.pid
ExecStartPre=/usr/bin/dnsmasq --test
-ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d
+ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d --local-service
ExecStartPost=/usr/bin/dnsmasq-resolvconf-helper start
ExecStopPre=/usr/bin/dnsmasq-resolvconf-helper stop
ExecStop=/bin/kill $MAINPID
diff --git a/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf b/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf
index bd0ee001a2..34d5135f92 100755
--- a/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf
+++ b/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf
@@ -77,7 +77,7 @@ bogus-priv
#except-interface=
# Or which to listen on by address (remember to include 127.0.0.1 if
# you use this.)
-listen-address=127.0.0.1
+#listen-address=127.0.0.1
# On systems which support it, dnsmasq binds the wildcard address,
# even when it is listening on only some interfaces. It then discards