aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2016-11-21 13:42:34 -0500
committerArmin Kuster <akuster808@gmail.com>2017-01-29 19:28:10 -0500
commit01f4d8df844680633bed5c90509fcb88f132ba3e (patch)
tree6d85ce8a7dacf6bb390295dd020d868c28cdceba
parentde930625274321de7379850aaabf5fbb5603d4a3 (diff)
downloadmeta-openembedded-contrib-01f4d8df844680633bed5c90509fcb88f132ba3e.tar.gz
meta-openembedded-contrib-01f4d8df844680633bed5c90509fcb88f132ba3e.tar.bz2
meta-openembedded-contrib-01f4d8df844680633bed5c90509fcb88f132ba3e.zip
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> 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
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 cde2244c85..32f8e59072 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 68b175c1fb..07b4817a7e 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