summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2018-02-13 18:06:45 -0600
committerJohn Klug <john.klug@multitech.com>2018-02-13 18:06:45 -0600
commitb641466c1a05d45a1d1625187980d9d05dbf4a9c (patch)
treedfa03eb7c8bfb606a590a18506985a3267e6479e
parentc65de8291433192973aa68b312d40aba982b81d9 (diff)
downloadmeta-mlinux-b641466c1a05d45a1d1625187980d9d05dbf4a9c.tar.gz
meta-mlinux-b641466c1a05d45a1d1625187980d9d05dbf4a9c.tar.bz2
meta-mlinux-b641466c1a05d45a1d1625187980d9d05dbf4a9c.zip
Add missing /etc/default/dnsmasq file
-rw-r--r--recipes-support/dnsmasq/dnsmasq.inc4
-rw-r--r--recipes-support/dnsmasq/files/default5
2 files changed, 8 insertions, 1 deletions
diff --git a/recipes-support/dnsmasq/dnsmasq.inc b/recipes-support/dnsmasq/dnsmasq.inc
index ad64477..fdd7ab7 100644
--- a/recipes-support/dnsmasq/dnsmasq.inc
+++ b/recipes-support/dnsmasq/dnsmasq.inc
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
#at least versions 2.15 and prior are moved to the archive folder on the server
SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV',1).split('.')[1]) > 15]}dnsmasq-${PV}.tar.gz;name=dnsmasq-${PV} \
file://init \
+ file://default \
file://dnsmasq.conf \
file://dnsmasq-resolvconf.service \
file://dnsmasq-noresolvconf.service \
@@ -47,9 +48,10 @@ do_install () {
"BINDIR=${D}${bindir}" \
"MANDIR=${D}${mandir}" \
install
- install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d
+ install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d ${D}${sysconfdir}/default
install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/
install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq
+ install -m 755 ${WORKDIR}/default ${D}${sysconfdir}/default/dnsmasq
install -d ${D}${systemd_unitdir}/system
diff --git a/recipes-support/dnsmasq/files/default b/recipes-support/dnsmasq/files/default
index 98190d2..a389aff 100644
--- a/recipes-support/dnsmasq/files/default
+++ b/recipes-support/dnsmasq/files/default
@@ -1 +1,6 @@
+# See /etc/init.d/dnsmasq
ENABLED="no"
+
+
+# Ignore the resolve.conf from the resolvconf package.
+IGNORE_RESOLVCONF="yes"