On 23.10.2012 14:25, Gene Czarcinski wrote: > This patch changes the way parameters are passed to dnsmasq. They are > put into a conf-file instead of being on the dnsmasq command line. > > **NOTE ** This has updated the related tests for the new > data format, etc. > > **NOTE** This patch does NOT include specifying interface= > > The command line now contains --conf-file=<filename> and a new > parameter --conf-dir=<directoryname> has been added. > > The new file and directory are put in the same directory as the > leases file. > --- > .gnulib | 2 +- > src/network/bridge_driver.c | 179 ++++++++++++++------- > src/network/bridge_driver.h | 8 +- > tests/networkxml2argvdata/isolated-network.argv | 24 +-- > .../networkxml2argvdata/nat-network-dns-hosts.argv | 14 +- > .../nat-network-dns-srv-record-minimal.argv | 35 ++-- > .../nat-network-dns-srv-record.argv | 35 ++-- > .../nat-network-dns-txt-record.argv | 29 ++-- > tests/networkxml2argvdata/nat-network.argv | 27 ++-- > tests/networkxml2argvdata/netboot-network.argv | 28 ++-- > .../networkxml2argvdata/netboot-proxy-network.argv | 25 +-- > tests/networkxml2argvdata/routed-network.argv | 12 +- > tests/networkxml2argvtest.c | 44 +---- > 13 files changed, 265 insertions(+), 197 deletions(-) > > diff --git a/.gnulib b/.gnulib > index d245e6d..2a9edc6 160000 > --- a/.gnulib > +++ b/.gnulib > @@ -1 +1 @@ > -Subproject commit d245e6ddd6ab2624d0d83acd8f111454f984f50f > +Subproject commit 2a9edc6f2b02a05553d266117ddee80b3e0a3749 This will downgrade the gnulib module Eric's just updated. You can avoid this by 'git submodule update'. It will disappear from 'git diff' then. I haven't look any closer on the pach itself. Michal -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list