From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Thu, 18 Nov 2010 20:16:42 +0000 (-0500)
Subject: Point at the correct file from the configuration instead.
X-Git-Tag: myplc-4.3-41~2
X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=commitdiff_plain;h=0c881f2066c9eeaaf1a90ec334fe34b9f857afd8

Point at the correct file from the configuration instead.
---

diff --git a/dns-config b/dns-config
index cc7b5e3..aaaa3f2 100755
--- a/dns-config
+++ b/dns-config
@@ -93,7 +93,7 @@ def main():
 domain-needed
 bogus-priv
 addn-hosts=/etc/plc_hosts
-resolv-file=/etc/resolv.conf
+resolv-file=/etc/plc_resolv.conf
 conf-dir=/etc/dnsmasq.d
 """.lstrip())
 
diff --git a/plc.d/dns b/plc.d/dns
index 361d639..9536c3e 100755
--- a/plc.d/dns
+++ b/plc.d/dns
@@ -60,7 +60,7 @@ case "$1" in
 	fi
 
 	if [ $PLC_DNS_ENABLED -eq 1 ] ; then
-	    plc_daemon dnsmasq -r /etc/plc_resolv.conf
+	    plc_daemon dnsmasq
 	    check
 	fi