summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2017-11-09 15:26:56 -0600
committerJohn Klug <john.klug@multitech.com>2017-11-10 09:39:55 -0600
commit7bc5be700dadcd615f553a0a67e289cb6da4b542 (patch)
treee71aa1eda99ea0a87c6e5edc16728e55e09b829f
parentb6341be57d94a8d1102d556ad60b64a35e2bc83f (diff)
downloadmeta-mlinux-7bc5be700dadcd615f553a0a67e289cb6da4b542.tar.gz
meta-mlinux-7bc5be700dadcd615f553a0a67e289cb6da4b542.tar.bz2
meta-mlinux-7bc5be700dadcd615f553a0a67e289cb6da4b542.zip
Make /etc/init.d/dnsmasq a configuration file for AEP compatibility
-rw-r--r--recipes-support/dnsmasq/dnsmasq.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/recipes-support/dnsmasq/dnsmasq.inc b/recipes-support/dnsmasq/dnsmasq.inc
index 9ef54fe..ad64477 100644
--- a/recipes-support/dnsmasq/dnsmasq.inc
+++ b/recipes-support/dnsmasq/dnsmasq.inc
@@ -75,7 +75,8 @@ do_install () {
fi
}
-CONFFILES_${PN} = "${sysconfdir}/dnsmasq.conf"
+# init.d/dnsmasq conflicts with AEP.
+CONFFILES_${PN} = "${sysconfdir}/dnsmasq.conf ${sysconfdir}/init.d/dnsmasq"
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"