]> xenbits.xensource.com Git - libvirt.git/commit
network: put dnsmasq parameters in conf-file instead of command line
authorGene Czarcinski <gene@czarc.net>
Thu, 6 Dec 2012 17:20:39 +0000 (12:20 -0500)
committerLaine Stump <laine@laine.org>
Tue, 11 Dec 2012 10:49:45 +0000 (05:49 -0500)
commit8b32c80df089a3612a0448c1a92abc2071d6b6a9
tree665a83715cc499da2a5439a10d08d66def93c732
parent2d5cd1d724084d9975b2514fb31776627acbe997
network: put dnsmasq parameters in conf-file instead of command line

This patch changes how parameters are passed to dnsmasq.  Instead of
being on the command line, the parameters are put into a file (one
parameter per line) and a commandline --conf-file= specifies the
location of the file.  The file is located in the same directory as
the leases file.

Putting the dnsmasq parameters into a configuration file
allows them to be examined and more easily understood than
examining the command lines displayed by "ps ax".  This is
especially true when a number of networks have been started.

When the use of dnsmasq was originally done, the required command line
was simple, but it has gotten more complicated over time and will
likely become even more complicated in the future.

Note: The test conf files have all been renamed .conf instead of
.argv, and tests/networkxml2xmlargvdata was moved to
tests/networkxml2xmlconfdata.
53 files changed:
src/network/bridge_driver.c
src/network/bridge_driver.h
tests/Makefile.am
tests/networkxml2argvdata/dhcp6-nat-network.argv [deleted file]
tests/networkxml2argvdata/dhcp6-nat-network.xml [deleted file]
tests/networkxml2argvdata/dhcp6-network.argv [deleted file]
tests/networkxml2argvdata/dhcp6-network.xml [deleted file]
tests/networkxml2argvdata/dhcp6host-routed-network.argv [deleted file]
tests/networkxml2argvdata/dhcp6host-routed-network.xml [deleted file]
tests/networkxml2argvdata/isolated-network.argv [deleted file]
tests/networkxml2argvdata/isolated-network.xml [deleted file]
tests/networkxml2argvdata/nat-network-dns-hosts.argv [deleted file]
tests/networkxml2argvdata/nat-network-dns-hosts.xml [deleted file]
tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv [deleted file]
tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.xml [deleted file]
tests/networkxml2argvdata/nat-network-dns-srv-record.argv [deleted file]
tests/networkxml2argvdata/nat-network-dns-srv-record.xml [deleted file]
tests/networkxml2argvdata/nat-network-dns-txt-record.argv [deleted file]
tests/networkxml2argvdata/nat-network-dns-txt-record.xml [deleted file]
tests/networkxml2argvdata/nat-network.argv [deleted file]
tests/networkxml2argvdata/nat-network.xml [deleted file]
tests/networkxml2argvdata/netboot-network.argv [deleted file]
tests/networkxml2argvdata/netboot-network.xml [deleted file]
tests/networkxml2argvdata/netboot-proxy-network.argv [deleted file]
tests/networkxml2argvdata/netboot-proxy-network.xml [deleted file]
tests/networkxml2argvdata/routed-network.argv [deleted file]
tests/networkxml2argvdata/routed-network.xml [deleted file]
tests/networkxml2argvtest.c [deleted file]
tests/networkxml2confdata/dhcp6-nat-network.conf [new file with mode: 0644]
tests/networkxml2confdata/dhcp6-nat-network.xml [new file with mode: 0644]
tests/networkxml2confdata/dhcp6-network.conf [new file with mode: 0644]
tests/networkxml2confdata/dhcp6-network.xml [new file with mode: 0644]
tests/networkxml2confdata/dhcp6host-routed-network.conf [new file with mode: 0644]
tests/networkxml2confdata/dhcp6host-routed-network.xml [new file with mode: 0644]
tests/networkxml2confdata/isolated-network.conf [new file with mode: 0644]
tests/networkxml2confdata/isolated-network.xml [new file with mode: 0644]
tests/networkxml2confdata/nat-network-dns-hosts.conf [new file with mode: 0644]
tests/networkxml2confdata/nat-network-dns-hosts.xml [new file with mode: 0644]
tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf [new file with mode: 0644]
tests/networkxml2confdata/nat-network-dns-srv-record-minimal.xml [new file with mode: 0644]
tests/networkxml2confdata/nat-network-dns-srv-record.conf [new file with mode: 0644]
tests/networkxml2confdata/nat-network-dns-srv-record.xml [new file with mode: 0644]
tests/networkxml2confdata/nat-network-dns-txt-record.conf [new file with mode: 0644]
tests/networkxml2confdata/nat-network-dns-txt-record.xml [new file with mode: 0644]
tests/networkxml2confdata/nat-network.conf [new file with mode: 0644]
tests/networkxml2confdata/nat-network.xml [new file with mode: 0644]
tests/networkxml2confdata/netboot-network.conf [new file with mode: 0644]
tests/networkxml2confdata/netboot-network.xml [new file with mode: 0644]
tests/networkxml2confdata/netboot-proxy-network.conf [new file with mode: 0644]
tests/networkxml2confdata/netboot-proxy-network.xml [new file with mode: 0644]
tests/networkxml2confdata/routed-network.conf [new file with mode: 0644]
tests/networkxml2confdata/routed-network.xml [new file with mode: 0644]
tests/networkxml2conftest.c [new file with mode: 0644]