diff options
| author |   Mark Asselstine <mark.asselstine@windriver.com> | 2016-11-21 13:42:35 -0500 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2016-12-14 09:20:09 -0500 |
| commit | ba665493a0dddf95797bab6bd17f8bf693f1e153 (patch) | |
| tree | 04a5d0b826a085179e70cc9956781cacf86a763f /meta-networking/recipes-support/dnsmasq | |
| parent | 2b457e6f1eda1fc4477210da1429185d144bfed6 (diff) | |
| download | meta-openembedded-contrib-ba665493a0dddf95797bab6bd17f8bf693f1e153.tar.gz | |
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>
Diffstat (limited to 'meta-networking/recipes-support/dnsmasq')
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 |