diff options
| author | Gene Czarcinski <gene@czarc.net> | 2012-12-06 12:20:39 -0500 |
|---|---|---|
| committer | Laine Stump <laine@laine.org> | 2012-12-11 05:49:45 -0500 |
| commit | 8b32c80df089a3612a0448c1a92abc2071d6b6a9 (patch) | |
| tree | 665a83715cc499da2a5439a10d08d66def93c732 /tests/networkxml2argvdata/nat-network.argv | |
| parent | 2d5cd1d724084d9975b2514fb31776627acbe997 (diff) | |
| download | libvirt-8b32c80df089a3612a0448c1a92abc2071d6b6a9.tar.gz | |
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.
Diffstat (limited to 'tests/networkxml2argvdata/nat-network.argv')
| -rw-r--r-- | tests/networkxml2argvdata/nat-network.argv | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv deleted file mode 100644 index 578a5ff432..0000000000 --- a/tests/networkxml2argvdata/nat-network.argv +++ /dev/null @@ -1,15 +0,0 @@ -@DNSMASQ@ \ ---strict-order \ ---domain-needed \ ---local=// \ ---conf-file= \ ---bind-dynamic \ ---interface virbr0 \ ---dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-no-override \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ ---dhcp-lease-max=253 \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \ ---addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts \ ---dhcp-range=2001:db8:ac10:fe01::1,ra-only \ ---dhcp-range=2001:db8:ac10:fd01::1,ra-only\ |