Fix for myplc-native:

[myplc.git] / plc.d / dns

diff --git a/plc.d/dns b/plc.d/dns
index 446c21f..b819e32 100755 (executable)
--- a/plc.d/dns
+++ b/plc.d/dns
@@ -8,37 +8,25 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: mail,v 1.2 2006/04/25 21:18:19 mlhuang Exp $
+# $Id$
 #
 
 # Source function library and configuration
 . /etc/plc.d/functions
 . /etc/planetlab/plc_config
 
+# Be verbose
+set -x
+
 case "$1" in
     start)
-       if [ "$PLC_DNS_ENABLED" != "1" ] ; then
-           exit 0
-       fi
+       [ $PLC_DNS_ENABLED -ne 1 ] && exit 0
 
        MESSAGE=$"Starting DNS server"
        dialog "$MESSAGE"
 
-       # From the default dnsmasq.conf configuration file:
-       #
-       # The [domain-needed and bogus-priv] options make you a better
-       # netizen, since they tell dnsmasq to filter out queries which
-       # the public DNS cannot answer, and which load the servers
-       # (especially the root servers) uneccessarily.
-       #
-       # The api-config bootstrap script writes node hostnames to
-       # /etc/plc_hosts.
-       #
-       cat >/etc/dnsmasq.conf <<EOF
-domain-needed
-bogus-priv
-addn-hosts=/etc/plc_hosts
-EOF
+       dns-config
+       check
 
        plc_daemon dnsmasq
        check
@@ -47,6 +35,7 @@ EOF
        ;;
 
     stop)
+       [ $PLC_DNS_ENABLED -ne 1 ] && exit 0
        MESSAGE=$"Stopping DNS server"
        dialog "$MESSAGE"