[Astlinux-commits] SF.net SVN: astlinux:[5421] branches/1.0

[<abe...@us...>]

Revision: 5421
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5421&view=rev
Author:   abelbeck
Date:     2012-01-29 03:02:02 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
dnsmasq, add LOCALDNS_LOCAL_DOMAIN rc.conf variable to enable/disable local-only lookups for DOMAIN

Modified Paths:
--------------
    branches/1.0/package/dnsmasq/dnsmasq.init
    branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf

Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init	2012-01-28 04:33:18 UTC (rev 5420)
+++ branches/1.0/package/dnsmasq/dnsmasq.init	2012-01-29 03:02:02 UTC (rev 5421)
@@ -93,6 +93,8 @@
 
 createDNSMASQbasic()
 {
+  local local_domain
+
   # DHCP options
   if [ "$1" = "dhcp" ]; then
     echo "dhcp-authoritative
@@ -108,11 +110,17 @@
     fi
   fi
   
+  if [ "$LOCALDNS_LOCAL_DOMAIN" = "no" ]; then
+    local_domain="#"
+  else
+    local_domain=""
+  fi
+
   # DNS options
   echo "no-negcache
 domain-needed
-bogus-priv
-local=/$DOMAIN/
+${local_domain}bogus-priv
+${local_domain}local=/$DOMAIN/
 expand-hosts
 domain=$DOMAIN
 resolv-file=/etc/resolv-extern.conf

Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2012-01-28 04:33:18 UTC (rev 5420)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2012-01-29 03:02:02 UTC (rev 5421)
@@ -99,6 +99,13 @@
 ## for DNS resolution on THIS machine.
 ## By default this is enabled provided dnsmasq is started, disable by setting to "no".
 #LOCALDNS=no
+##
+## By default the DNS lookup for DOMAIN is local-only, recommended with local interfaces and/or
+## a unique local DOMAIN.  If there are no local interfaces defined, it may be useful
+## to define DOMAIN the same as an upstream DNS server, in that case
+## disabling LOCALDNS_LOCAL_DOMAIN would be desirable.
+## By default this is enabled providing local-only lookups for DOMAIN, disable by setting to "no".
+#LOCALDNS_LOCAL_DOMAIN=no
 
 ## You don't have to use DHCP with all of your internal interfaces.
 ## Here you can specify a list of interfaces that will not have a DHCP range

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.