External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-04 20:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove dnsmasq command line parameter "--filterwin2k"

Browse Source 
This patch removed the "--filterwin2k" dnsmasq command line
parameter which was unnecessary for domain specification,
possibly blocked some usage, and was command line clutter.

Gene Czarcinski <gene@czarc.net>
(cherry picked from commit f20b7dbe63)

Conflicts:
	tests/networkxml2argvdata/nat-network-dns-txt-record.argv
This commit is contained in:
Gene Czarcinski 2012-09-06 12:08:22 -04:00 committed by Cole Robinson
parent 3fcc90968c
commit 38e6d7b981
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/bridge_driver.c
View File

@ -495,7 +495,7 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network,
/* need to specify local even if no domain specified */ /* need to specify local even if no domain specified */
virCommandAddArgFormat(cmd, "--local=/%s/", virCommandAddArgFormat(cmd, "--local=/%s/",
network->def->domain ? network->def->domain : ""); network->def->domain ? network->def->domain : "");
virCommandAddArgList(cmd, "--domain-needed", "--filterwin2k", NULL); virCommandAddArg(cmd, "--domain-needed");
if (pidfile) if (pidfile)
virCommandAddArgPair(cmd, "--pid-file", pidfile); virCommandAddArgPair(cmd, "--pid-file", pidfile);

2
tests/networkxml2argvdata/isolated-network.argv
View File

@ -1,5 +1,5 @@
@DNSMASQ@ --strict-order --bind-interfaces \ @DNSMASQ@ --strict-order --bind-interfaces \
--local=// --domain-needed --filterwin2k --conf-file= \ --local=// --domain-needed --conf-file= \
--except-interface lo --dhcp-option=3 --no-resolv \ --except-interface lo --dhcp-option=3 --no-resolv \
--listen-address 192.168.152.1 \ --listen-address 192.168.152.1 \
--dhcp-range 192.168.152.2,192.168.152.254 \ --dhcp-range 192.168.152.2,192.168.152.254 \

2
tests/networkxml2argvdata/nat-network-dns-hosts.argv
View File

@ -1,4 +1,4 @@
@DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \ @DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \
--local=/example.com/ --domain-needed --filterwin2k \ --local=/example.com/ --domain-needed \
--conf-file= --except-interface lo --listen-address 192.168.122.1 \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \
--expand-hosts --addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ --expand-hosts --addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\

2
tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv
View File

@ -1,7 +1,7 @@
@DNSMASQ@ \ @DNSMASQ@ \
--strict-order \ --strict-order \
--bind-interfaces \ --bind-interfaces \
--local=// --domain-needed --filterwin2k --conf-file= \ --local=// --domain-needed --conf-file= \
--except-interface lo \ --except-interface lo \
--srv-host=name.tcp.,,,, \ --srv-host=name.tcp.,,,, \
--listen-address 192.168.122.1 \ --listen-address 192.168.122.1 \

2
tests/networkxml2argvdata/nat-network-dns-srv-record.argv
View File

@ -1,7 +1,7 @@
@DNSMASQ@ \ @DNSMASQ@ \
--strict-order \ --strict-order \
--bind-interfaces \ --bind-interfaces \
--local=// --domain-needed --filterwin2k --conf-file= \ --local=// --domain-needed --conf-file= \
--except-interface lo \ --except-interface lo \
--srv-host=name.tcp.test-domain-name,.,1024,10,10 \ --srv-host=name.tcp.test-domain-name,.,1024,10,10 \
--listen-address 192.168.122.1 \ --listen-address 192.168.122.1 \

2
tests/networkxml2argvdata/nat-network-dns-txt-record.argv
View File

@ -1,5 +1,5 @@
@DNSMASQ@ --strict-order --bind-interfaces \ @DNSMASQ@ --strict-order --bind-interfaces \
--local=// --domain-needed --filterwin2k --conf-file= \ --local=// --domain-needed --conf-file= \
--except-interface lo --txt-record=example,example value \ --except-interface lo --txt-record=example,example value \
--listen-address 192.168.122.1 --listen-address 192.168.123.1 \ --listen-address 192.168.122.1 --listen-address 192.168.123.1 \
--listen-address 2001:db8:ac10:fe01::1 \ --listen-address 2001:db8:ac10:fe01::1 \

2
tests/networkxml2argvdata/nat-network.argv
View File

@ -1,5 +1,5 @@
@DNSMASQ@ --strict-order --bind-interfaces \ @DNSMASQ@ --strict-order --bind-interfaces \
--local=// --domain-needed --filterwin2k --conf-file= \ --local=// --domain-needed --conf-file= \
--except-interface lo --listen-address 192.168.122.1 \ --except-interface lo --listen-address 192.168.122.1 \
--listen-address 192.168.123.1 --listen-address 2001:db8:ac10:fe01::1 \ --listen-address 192.168.123.1 --listen-address 2001:db8:ac10:fe01::1 \
--listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \

2
tests/networkxml2argvdata/netboot-network.argv
View File

@ -1,5 +1,5 @@
@DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \ @DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \
--local=/example.com/ --domain-needed --filterwin2k --conf-file= \ --local=/example.com/ --domain-needed --conf-file= \
--except-interface lo --listen-address 192.168.122.1 \ --except-interface lo --listen-address 192.168.122.1 \
--dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-range 192.168.122.2,192.168.122.254 \
--dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \

2
tests/networkxml2argvdata/netboot-proxy-network.argv
View File

@ -1,5 +1,5 @@
@DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \ @DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \
--local=/example.com/ --domain-needed --filterwin2k --conf-file= \ --local=/example.com/ --domain-needed --conf-file= \
--except-interface lo --listen-address 192.168.122.1 \ --except-interface lo --listen-address 192.168.122.1 \
--dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-range 192.168.122.2,192.168.122.254 \
--dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \

2
tests/networkxml2argvdata/routed-network.argv
View File

@ -1,3 +1,3 @@
@DNSMASQ@ --strict-order --bind-interfaces \ @DNSMASQ@ --strict-order --bind-interfaces \
--local=// --domain-needed --filterwin2k --conf-file= \ --local=// --domain-needed --conf-file= \
--except-interface lo --listen-address 192.168.122.1\ --except-interface lo --listen-address 192.168.122.1\