[4/51] [abbrv] git commit: VPC : revert dnsmasq.conf

[al...@apache.org]

VPC : revert dnsmasq.conf


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/47078883
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/47078883
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/47078883

Branch: refs/heads/vpc
Commit: 4707888363c04895d41d216476a2c023b813aa42
Parents: 9ae62d3
Author: anthony <an...@cloud.com>
Authored: Wed Jun 13 15:48:39 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Fri Jun 15 14:33:22 2012 -0700

----------------------------------------------------------------------
 patches/systemvm/debian/config/etc/dnsmasq.conf |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/47078883/patches/systemvm/debian/config/etc/dnsmasq.conf
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/etc/dnsmasq.conf b/patches/systemvm/debian/config/etc/dnsmasq.conf
index ca32869..8f999a7 100644
--- a/patches/systemvm/debian/config/etc/dnsmasq.conf
+++ b/patches/systemvm/debian/config/etc/dnsmasq.conf
@@ -70,18 +70,19 @@ local=/2.vmops-test.vmops.com/
 # specified interfaces (and the loopback) give the name of the
 # interface (eg eth0) here.
 # Repeat the line for more than one interface.
-#interface=eth0
-
+interface=eth0
 # Or you can specify which interface _not_ to listen on
+except-interface=eth1
+except-interface=eth2
 except-interface=lo
-
 # Or which to listen on by address (remember to include 127.0.0.1 if
 # you use this.)
 #listen-address=
 # If you want dnsmasq to provide only DNS service on an interface,
 # configure it as shown above, and then use the following line to
 # disable DHCP on it.
-#no-dhcp-interface=eth1
+no-dhcp-interface=eth1
+no-dhcp-interface=eth2
 
 # On systems which support it, dnsmasq binds the wildcard address,
 # even when it is listening on only some interfaces. It then discards
@@ -110,14 +111,14 @@ expand-hosts
 # 2) Sets the "domain" DHCP option thereby potentially setting the
 #    domain of all systems configured by DHCP
 # 3) Provides the domain part for "expand-hosts"
-#domain=2.vmops-test.vmops.com
+domain=2.vmops-test.vmops.com
 
 # Uncomment this to enable the integrated DHCP server, you need
 # to supply the range of addresses available for lease and optionally
 # a lease time. If you have more than one network, you will need to
 # repeat this for each network on which you want to supply DHCP
 # service.
-#dhcp-range=10.1.1.1,static
+dhcp-range=10.1.1.1,static
 #dhcp-range=10.0.0.1,10.255.255.255
 dhcp-hostsfile=/etc/dhcphosts.txt