File a43c7338-dnsmasq-hostfile-fix.patch of Package libvirt

Overview Repositories Revisions Requests Users Attributes Meta

File a43c7338-dnsmasq-hostfile-fix.patch of Package libvirt (Revision f0d49f6b3845a898444ce02f3f037f5d)

Currently displaying revision f0d49f6b3845a898444ce02f3f037f5d , Show latest

commit a43c7338d8772aa3a5bc0ec5914d3c28c20447c3
Author: Kay Schubert <kayegypt@web.de>
Date:   Thu Jan 6 09:14:58 2011 +0100

bridge: Fix generation of dnsmasq's --dhcp-hostsfile option
    
    I added a host definition to a network definition:
    
    <network>
      <name>Lokal</name>
      <uuid>2074f379-b82c-423f-9ada-305d8088daaa</uuid>
      <bridge name='virbr1' stp='on' delay='0' />
      <ip address='192.168.180.1' netmask='255.255.255.0'>
        <dhcp>
          <range start='192.168.180.128' end='192.168.180.254' />
          <host mac='23:74:00:03:42:02' name='somevm' ip='192.168.180.10' />
        </dhcp>
      </ip>
    </network>
    
    But due to the wrong if-statement the argument --dhcp-hostsfile doesn't get
    added to the dnsmasq command. The patch below fixes it for me.

diff --git a/AUTHORS b/AUTHORS
index b204bd6..721b8f8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -142,6 +142,7 @@ Patches have also been contributed by:
   Josh Durgin          <joshd@hq.newdream.net>
   Roopa Prabhu         <roprabhu@cisco.com>
   Paweł Krześniak      <pawel.krzesniak@gmail.com>
+  Kay Schubert         <kayegypt@web.de>
 
   [....send patches to get your name here....]
 
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 7d43ef5..4c64a74 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -524,7 +524,7 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network,
             goto cleanup;
         }
 
-        if (networkSaveDnsmasqHostsfile(ipdef, dctx, false) < 0) {
+        if (networkSaveDnsmasqHostsfile(ipdef, dctx, false) == 0) {
             virCommandAddArgPair(cmd, "--dhcp-hostsfile",
                                  dctx->hostsfile->path);
         }

Places

File a43c7338-dnsmasq-hostfile-fix.patch of Package libvirt (Revision f0d49f6b3845a898444ce02f3f037f5d)

Places