diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2016-11-21 13:42:35 -0500 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-01-29 19:28:49 -0500 |
commit | 6cedb8409996ec5efb0ba3a14913f368bd517cbd (patch) | |
tree | d0f64be47fceee2d28c12b5b95e715bc58007ae5 /meta-networking | |
parent | 01f4d8df844680633bed5c90509fcb88f132ba3e (diff) | |
download | meta-openembedded-6cedb8409996ec5efb0ba3a14913f368bd517cbd.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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking')
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 32f8e5907..0c64fab00 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 | |||
6 | Type=forking | 6 | Type=forking |
7 | PIDFile=/run/dnsmasq.pid | 7 | PIDFile=/run/dnsmasq.pid |
8 | ExecStartPre=/usr/bin/dnsmasq --test | 8 | ExecStartPre=/usr/bin/dnsmasq --test |
9 | ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d | 9 | ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d --local-service |
10 | ExecStop=/bin/kill $MAINPID | 10 | ExecStop=/bin/kill $MAINPID |
11 | ExecReload=/bin/kill -HUP $MAINPID | 11 | ExecReload=/bin/kill -HUP $MAINPID |
12 | 12 | ||
diff --git a/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service b/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service index 07b4817a7..2980f7def 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 | |||
6 | Type=forking | 6 | Type=forking |
7 | PIDFile=/run/dnsmasq.pid | 7 | PIDFile=/run/dnsmasq.pid |
8 | ExecStartPre=/usr/bin/dnsmasq --test | 8 | ExecStartPre=/usr/bin/dnsmasq --test |
9 | ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d | 9 | ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d --local-service |
10 | ExecStartPost=/usr/bin/dnsmasq-resolvconf-helper start | 10 | ExecStartPost=/usr/bin/dnsmasq-resolvconf-helper start |
11 | ExecStopPre=/usr/bin/dnsmasq-resolvconf-helper stop | 11 | ExecStopPre=/usr/bin/dnsmasq-resolvconf-helper stop |
12 | ExecStop=/bin/kill $MAINPID | 12 | 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 bd0ee001a..34d5135f9 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 | |||
77 | #except-interface= | 77 | #except-interface= |
78 | # Or which to listen on by address (remember to include 127.0.0.1 if | 78 | # Or which to listen on by address (remember to include 127.0.0.1 if |
79 | # you use this.) | 79 | # you use this.) |
80 | listen-address=127.0.0.1 | 80 | #listen-address=127.0.0.1 |
81 | 81 | ||
82 | # On systems which support it, dnsmasq binds the wildcard address, | 82 | # On systems which support it, dnsmasq binds the wildcard address, |
83 | # even when it is listening on only some interfaces. It then discards | 83 | # even when it is listening on only some interfaces. It then discards |