diff options
| author |   Mark Asselstine <mark.asselstine@windriver.com> | 2016-11-21 13:42:34 -0500 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2016-12-14 09:20:09 -0500 |
| commit | 2b457e6f1eda1fc4477210da1429185d144bfed6 (patch) | |
| tree | 8c19efcca06c2c6924aba8f5837b9b8462e4d8dc /meta-networking/recipes-support | |
| parent | 4166296e41fa4d8fc5736e024798b131d4c1bbf8 (diff) | |
| download | meta-openembedded-contrib-2b457e6f1eda1fc4477210da1429185d144bfed6.tar.gz | |
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.
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')
| -rw-r--r-- | meta-networking/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service | 2 | ||||
| -rw-r--r-- | meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-networking/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service b/meta-networking/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service index cde2244c85b..32f8e590726 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 +ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d 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 68b175c1fbc..07b4817a7e5 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 +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 |