From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Wed, 17 Nov 2010 18:36:47 +0000 (-0500)
Subject: Add conf-dir to dnsmasq settings so that the configuration can be extended.
X-Git-Tag: myplc-4.3-39~3
X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=commitdiff_plain;h=64138545e2b3f53856f728b820ea6262290f7ae0

Add conf-dir to dnsmasq settings so that the configuration can be extended.
---

diff --git a/dns-config b/dns-config
index 401a3a7..cc7b5e3 100755
--- a/dns-config
+++ b/dns-config
@@ -94,6 +94,7 @@ domain-needed
 bogus-priv
 addn-hosts=/etc/plc_hosts
 resolv-file=/etc/resolv.conf
+conf-dir=/etc/dnsmasq.d
 """.lstrip())
 
     # Reload dnsmasq