From 01f4d8df844680633bed5c90509fcb88f132ba3e Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Mon, 21 Nov 2016 13:42:34 -0500 Subject: 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 Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald Signed-off-by: Armin Kuster --- .../recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service | 2 +- .../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 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 -- cgit 1.2.3-korg