|
 |
f87237 |
commit f20b7dbe633acf7df9921027c6ca4f0b97918c8c
|
|
|
f87237 |
Author: Gene Czarcinski <gene@czarc.net>
|
|
|
f87237 |
Date: Thu Sep 6 12:08:22 2012 -0400
|
|
|
f87237 |
|
|
|
f87237 |
remove dnsmasq command line parameter "--filterwin2k"
|
|
|
f87237 |
|
|
|
f87237 |
This patch removed the "--filterwin2k" dnsmasq command line
|
|
|
f87237 |
parameter which was unnecessary for domain specification,
|
|
|
f87237 |
possibly blocked some usage, and was command line clutter.
|
|
|
f87237 |
|
|
|
f87237 |
Gene Czarcinski <gene@czarc.net>
|
|
|
f87237 |
|
|
|
f87237 |
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
|
|
|
f87237 |
index 53eebed..808c843 100644
|
|
|
f87237 |
--- a/src/network/bridge_driver.c
|
|
|
f87237 |
+++ b/src/network/bridge_driver.c
|
|
|
f87237 |
@@ -543,7 +543,7 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network,
|
|
|
f87237 |
/* need to specify local even if no domain specified */
|
|
|
f87237 |
virCommandAddArgFormat(cmd, "--local=/%s/",
|
|
|
f87237 |
network->def->domain ? network->def->domain : "");
|
|
|
f87237 |
- virCommandAddArgList(cmd, "--domain-needed", "--filterwin2k", NULL);
|
|
|
f87237 |
+ virCommandAddArg(cmd, "--domain-needed");
|
|
|
f87237 |
|
|
|
f87237 |
if (pidfile)
|
|
|
f87237 |
virCommandAddArgPair(cmd, "--pid-file", pidfile);
|
|
|
f87237 |
diff --git a/tests/networkxml2argvdata/isolated-network.argv b/tests/networkxml2argvdata/isolated-network.argv
|
|
|
f87237 |
index 276f42a..048c72b 100644
|
|
|
f87237 |
--- a/tests/networkxml2argvdata/isolated-network.argv
|
|
|
f87237 |
+++ b/tests/networkxml2argvdata/isolated-network.argv
|
|
|
f87237 |
@@ -1,5 +1,5 @@
|
|
|
f87237 |
@DNSMASQ@ --strict-order --bind-interfaces \
|
|
|
f87237 |
---local=// --domain-needed --filterwin2k --conf-file= \
|
|
|
f87237 |
+--local=// --domain-needed --conf-file= \
|
|
|
f87237 |
--except-interface lo --dhcp-option=3 --no-resolv \
|
|
|
f87237 |
--listen-address 192.168.152.1 \
|
|
|
f87237 |
--dhcp-range 192.168.152.2,192.168.152.254 \
|
|
|
f87237 |
diff --git a/tests/networkxml2argvdata/nat-network-dns-hosts.argv b/tests/networkxml2argvdata/nat-network-dns-hosts.argv
|
|
|
f87237 |
index 8040e2a..03a0676 100644
|
|
|
f87237 |
--- a/tests/networkxml2argvdata/nat-network-dns-hosts.argv
|
|
|
f87237 |
+++ b/tests/networkxml2argvdata/nat-network-dns-hosts.argv
|
|
|
f87237 |
@@ -1,4 +1,4 @@
|
|
|
f87237 |
@DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \
|
|
|
f87237 |
---local=/example.com/ --domain-needed --filterwin2k \
|
|
|
f87237 |
+--local=/example.com/ --domain-needed \
|
|
|
f87237 |
--conf-file= --except-interface lo --listen-address 192.168.122.1 \
|
|
|
f87237 |
--expand-hosts --addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\
|
|
|
f87237 |
diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv
|
|
|
f87237 |
index bb50fd6..a1e4200 100644
|
|
|
f87237 |
--- a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv
|
|
|
f87237 |
+++ b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv
|
|
|
f87237 |
@@ -1,7 +1,7 @@
|
|
|
f87237 |
@DNSMASQ@ \
|
|
|
f87237 |
--strict-order \
|
|
|
f87237 |
--bind-interfaces \
|
|
|
f87237 |
---local=// --domain-needed --filterwin2k --conf-file= \
|
|
|
f87237 |
+--local=// --domain-needed --conf-file= \
|
|
|
f87237 |
--except-interface lo \
|
|
|
f87237 |
--srv-host=name.tcp.,,,, \
|
|
|
f87237 |
--listen-address 192.168.122.1 \
|
|
|
f87237 |
diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv
|
|
|
f87237 |
index 36498f2..8af38c4 100644
|
|
|
f87237 |
--- a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv
|
|
|
f87237 |
+++ b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv
|
|
|
f87237 |
@@ -1,7 +1,7 @@
|
|
|
f87237 |
@DNSMASQ@ \
|
|
|
f87237 |
--strict-order \
|
|
|
f87237 |
--bind-interfaces \
|
|
|
f87237 |
---local=// --domain-needed --filterwin2k --conf-file= \
|
|
|
f87237 |
+--local=// --domain-needed --conf-file= \
|
|
|
f87237 |
--except-interface lo \
|
|
|
f87237 |
--srv-host=name.tcp.test-domain-name,.,1024,10,10 \
|
|
|
f87237 |
--listen-address 192.168.122.1 \
|
|
|
f87237 |
diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv
|
|
|
f87237 |
index 2a6c799..404b56a 100644
|
|
|
f87237 |
--- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv
|
|
|
f87237 |
+++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv
|
|
|
f87237 |
@@ -1,5 +1,5 @@
|
|
|
f87237 |
@DNSMASQ@ --strict-order --bind-interfaces \
|
|
|
f87237 |
---local=// --domain-needed --filterwin2k --conf-file= \
|
|
|
f87237 |
+--local=// --domain-needed --conf-file= \
|
|
|
f87237 |
--except-interface lo --txt-record=example,example value \
|
|
|
f87237 |
--listen-address 192.168.122.1 --listen-address 192.168.123.1 \
|
|
|
f87237 |
--listen-address 2001:db8:ac10:fe01::1 \
|
|
|
f87237 |
diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv
|
|
|
f87237 |
index 265b931..1dc8f73 100644
|
|
|
f87237 |
--- a/tests/networkxml2argvdata/nat-network.argv
|
|
|
f87237 |
+++ b/tests/networkxml2argvdata/nat-network.argv
|
|
|
f87237 |
@@ -1,5 +1,5 @@
|
|
|
f87237 |
@DNSMASQ@ --strict-order --bind-interfaces \
|
|
|
f87237 |
---local=// --domain-needed --filterwin2k --conf-file= \
|
|
|
f87237 |
+--local=// --domain-needed --conf-file= \
|
|
|
f87237 |
--except-interface lo --listen-address 192.168.122.1 \
|
|
|
f87237 |
--listen-address 192.168.123.1 --listen-address 2001:db8:ac10:fe01::1 \
|
|
|
f87237 |
--listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \
|
|
|
f87237 |
diff --git a/tests/networkxml2argvdata/netboot-network.argv b/tests/networkxml2argvdata/netboot-network.argv
|
|
|
f87237 |
index 4f998d5..5a85ec2 100644
|
|
|
f87237 |
--- a/tests/networkxml2argvdata/netboot-network.argv
|
|
|
f87237 |
+++ b/tests/networkxml2argvdata/netboot-network.argv
|
|
|
f87237 |
@@ -1,5 +1,5 @@
|
|
|
f87237 |
@DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \
|
|
|
f87237 |
---local=/example.com/ --domain-needed --filterwin2k --conf-file= \
|
|
|
f87237 |
+--local=/example.com/ --domain-needed --conf-file= \
|
|
|
f87237 |
--except-interface lo --listen-address 192.168.122.1 \
|
|
|
f87237 |
--dhcp-range 192.168.122.2,192.168.122.254 \
|
|
|
f87237 |
--dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \
|
|
|
f87237 |
diff --git a/tests/networkxml2argvdata/netboot-proxy-network.argv b/tests/networkxml2argvdata/netboot-proxy-network.argv
|
|
|
f87237 |
index 89319ef..36836b0 100644
|
|
|
f87237 |
--- a/tests/networkxml2argvdata/netboot-proxy-network.argv
|
|
|
f87237 |
+++ b/tests/networkxml2argvdata/netboot-proxy-network.argv
|
|
|
f87237 |
@@ -1,5 +1,5 @@
|
|
|
f87237 |
@DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \
|
|
|
f87237 |
---local=/example.com/ --domain-needed --filterwin2k --conf-file= \
|
|
|
f87237 |
+--local=/example.com/ --domain-needed --conf-file= \
|
|
|
f87237 |
--except-interface lo --listen-address 192.168.122.1 \
|
|
|
f87237 |
--dhcp-range 192.168.122.2,192.168.122.254 \
|
|
|
f87237 |
--dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \
|
|
|
f87237 |
diff --git a/tests/networkxml2argvdata/routed-network.argv b/tests/networkxml2argvdata/routed-network.argv
|
|
|
f87237 |
index ac43991..77e802f 100644
|
|
|
f87237 |
--- a/tests/networkxml2argvdata/routed-network.argv
|
|
|
f87237 |
+++ b/tests/networkxml2argvdata/routed-network.argv
|
|
|
f87237 |
@@ -1,3 +1,3 @@
|
|
|
f87237 |
@DNSMASQ@ --strict-order --bind-interfaces \
|
|
|
f87237 |
---local=// --domain-needed --filterwin2k --conf-file= \
|
|
|
f87237 |
+--local=// --domain-needed --conf-file= \
|
|
|
f87237 |
--except-interface lo --listen-address 192.168.122.1\
|