Skip to contentSkip to conversation

dnsmasq: read the conf files found in dnsmasq.d

PATCH New Mark Asselstine 1 participant 2 messages Nov 21, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 dnsmasq: read the conf files found in dnsmasq.d

The dnsmasq package installs a ${sysconfigdir}/dnsmasq.d directory but doesn't currently use any configuration files that might be placed there. This goes against what the user would expect and doesn't match what you see in other distros.

We could ensure this config directory is read when dnsmasq is started, as we are doing here, or by including it in the main dnsmasq.conf file. By doing it here we can have better reuseability of the main dnsmasq.conf file by other instances of dnsmasq.

There are currently no files added to the dnsmasq.d directory for core oe images, so this should not result in any runtime behavior changes.

---
 .../recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service          | 2 +-
 .../recipes-support/dnsmasq/files/dnsmasq-resolvconf.service            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta-networking/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service +1 -1
index cde2244..32f8e59 100644
@@ -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
+ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d
 ExecStop=/bin/kill $MAINPID
 ExecReload=/bin/kill -HUP $MAINPID
 
meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service +1 -1
index 68b175c..07b4817 100644
@@ -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
+ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d
 ExecStartPost=/usr/bin/dnsmasq-resolvconf-helper start
 ExecStopPre=/usr/bin/dnsmasq-resolvconf-helper stop
 ExecStop=/bin/kill $MAINPID
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/2 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...

---
 .../recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service          | 2 +-
 .../recipes-support/dnsmasq/files/dnsmasq-resolvconf.service            | 2 +-
 meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta-networking/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service +1 -1
index 32f8e59..0c64fab 100644
@@ -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
 
meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service +1 -1
index 07b4817..2980f7d 100644
@@ -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
meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf +1 -1
index bd0ee00..34d5135 100755
@@ -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
Signature · 1 line
2.7.4