[Astlinux-commits] SF.net SVN: astlinux: [1159] trunk

[<dha...@us...>]

Revision: 1159
          http://astlinux.svn.sourceforge.net/astlinux/?rev=1159&view=rev
Author:   dhartman
Date:     2007-08-09 05:39:20 -0700 (Thu, 09 Aug 2007)

Log Message:
-----------
add support to disable dhcp on eth2 or 3

Modified Paths:
--------------
    trunk/package/dnsmasq/dnsmasq.init
    trunk/target/generic/target_skeleton/stat/etc/rc.conf

Modified: trunk/package/dnsmasq/dnsmasq.init
===================================================================
--- trunk/package/dnsmasq/dnsmasq.init	2007-08-08 20:32:31 UTC (rev 1158)
+++ trunk/package/dnsmasq/dnsmasq.init	2007-08-09 12:39:20 UTC (rev 1159)
@@ -68,6 +68,10 @@
 echo "dhcp-boot=$BOOTPFILE,$HOSTNAME.$DOMAIN,$INTIP" >> /tmp/etc/dnsmasq.conf
 fi
 
+if [ "$INT2IFDNS" -a "$INT2IFDNS" = "off" ]
+then
+echo "# DNS disabled on INT2IF" >> /tmp/etc/dnsmasq.conf
+else
 if [ "$INT2IF" ]
 then
 echo "
@@ -78,7 +82,11 @@
 dhcp-option=lan2,66,$INT2IP
 dhcp-option=lan2,150,$INT2IP" >> /tmp/etc/dnsmasq.conf
 fi
+fi
 
+if [ "$INT2IFDNS" -a "$INT2IFDNS" = "off" ]
+then
+echo "# DNS disabled on INT3IF" >> /tmp/etc/dnsmasq.conf
 if [ "$INT3IF" ]
 then
 echo "
@@ -89,6 +97,7 @@
 dhcp-option=lan3,66,$INT3IP
 dhcp-option=lan3,150,$INT3IP" >> /tmp/etc/dnsmasq.conf
 fi
+fi
 
 echo "# Create /mnt/kd/dnsmasq.static to specify additional settings." >> /tmp/etc/dnsmasq.conf
 

Modified: trunk/target/generic/target_skeleton/stat/etc/rc.conf
===================================================================
--- trunk/target/generic/target_skeleton/stat/etc/rc.conf	2007-08-08 20:32:31 UTC (rev 1158)
+++ trunk/target/generic/target_skeleton/stat/etc/rc.conf	2007-08-09 12:39:20 UTC (rev 1159)
@@ -141,6 +141,10 @@
 ##for DNS resolution on THIS machine.
 #LOCALDNS=yes
 
+##Disable DHCP on INT2 or INT3                                                                                                                                   
+#INT2IFDNS=off
+#INT3IFDNS=off
+
 ##If you do not define the INTIF, I will not try to start one.
 ##If you do not define the INTIF, I will also not start the following services:
 ##dnsmasq iptables astshape (PBX only mode)


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