summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--recipes-core/images/mlinux-rs9113-factory-image.bb2
-rw-r--r--recipes-support/dnsmasq/files/default1
-rw-r--r--recipes-support/dnsmasq/files/init2
3 files changed, 4 insertions, 1 deletions
diff --git a/recipes-core/images/mlinux-rs9113-factory-image.bb b/recipes-core/images/mlinux-rs9113-factory-image.bb
index adbb5b6..4abc8af 100644
--- a/recipes-core/images/mlinux-rs9113-factory-image.bb
+++ b/recipes-core/images/mlinux-rs9113-factory-image.bb
@@ -2,4 +2,4 @@ require mlinux-factory-image.bb
DESCRIPTION = "mLinux factory image with rs9113 drivers"
# Extra stuff to install
-IMAGE_INSTALL += "bluez5-noinst-tools python-dbus rs9113 "
+IMAGE_INSTALL += "dnsmasq bluez5-noinst-tools python-dbus rs9113 "
diff --git a/recipes-support/dnsmasq/files/default b/recipes-support/dnsmasq/files/default
new file mode 100644
index 0000000..98190d2
--- /dev/null
+++ b/recipes-support/dnsmasq/files/default
@@ -0,0 +1 @@
+ENABLED="no"
diff --git a/recipes-support/dnsmasq/files/init b/recipes-support/dnsmasq/files/init
index 51c95df..5f457f8 100644
--- a/recipes-support/dnsmasq/files/init
+++ b/recipes-support/dnsmasq/files/init
@@ -13,6 +13,8 @@ then
. /etc/default/$NAME
fi
+[[ "$ENABLED" = "yes" ]] || exit
+
DNSMASQ_CONF="/etc/dnsmasq.conf"
test "/etc/dnsmasq.d/*" != '/etc/dnsmasq.d/*' && DNSMASQ_CONF="${DNSMASQ_CONF} /etc/dnsmasq.d/*"