4 Commits

Author	SHA1	Message	Date
Ján Tomko	d8bd24a9ec	Remove the space before the slash in network XML ... This matches the style we use elsewhere and allows nat-network-dns-srv-record{,-minimal}.xml to be tested in network XML -> XML test.	2013-08-28 08:05:46 +02:00
Laine Stump	db2536a627	Revert "Add support for <option> tag in network config" ... This reverts commit 383ebc4694. We decided the xml for this feature needed more thought to make sure we are doing it the best way, in particular wrt option values that have multiple items.	2013-02-27 10:55:24 -05:00
Pieter Hollants	383ebc4694	Add support for <option> tag in network config ... This patch adds support for a new <option>-Tag in the <dhcp> block of network configs, based on a subset of the fifth proposal by Laine Stump in the mailing list discussion at https://www.redhat.com/archives/libvir-list/2012-November/msg01054.html. Any such defined option will result in a dhcp-option=<number>,"<value>" statement in the generated dnsmasq configuration file. Currently, DHCP options can be specified by number only and there is no whitelisting or blacklisting of option numbers, which should probably be added. Signed-off-by: Pieter Hollants <pieter@hollants.com> Signed-off-by: Laine Stump <laine@laine.org>	2013-02-22 19:45:19 -05:00
Gene Czarcinski	8b32c80df0	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.	2012-12-11 05:49:45 -05:00