]> xenbits.xensource.com Git - libvirt.git/commitdiff
network: assume DNSMASQ_CAPS_RA_PARAM
authorJán Tomko <jtomko@redhat.com>
Tue, 14 Dec 2021 16:59:09 +0000 (17:59 +0100)
committerJán Tomko <jtomko@redhat.com>
Wed, 15 Dec 2021 14:28:17 +0000 (15:28 +0100)
Introduced by dnsmasq commit:
commit c4cd95df68b573b63d234ecdb675228657d65353
Author:     Simon Kelley <simon@thekelleys.org.uk>
CommitDate: 2013-10-10 20:58:11 +0100

    Add --ra-param and remove --force-fast-ra

git describe: v2.67rc3-3-gc4cd95d contains: v2.67rc4~12

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
src/network/bridge_driver.c

index dffe4e15746e3889a6463d0ac56bf81926752688..a4535b1b496b0edbd8d9904cdc7307ba039fc4b6 100644 (file)
@@ -1197,10 +1197,8 @@ networkDnsmasqConfContents(virNetworkObj *obj,
     if (def->forward.type == VIR_NETWORK_FORWARD_NONE) {
         virBufferAddLit(&configbuf, "dhcp-option=3\n"
                         "no-resolv\n");
-        if (dnsmasqCapsGet(caps, DNSMASQ_CAPS_RA_PARAM)) {
-            /* interface=* (any), interval=0 (default), lifetime=0 (seconds) */
-            virBufferAddLit(&configbuf, "ra-param=*,0,0\n");
-        }
+        /* interface=* (any), interval=0 (default), lifetime=0 (seconds) */
+        virBufferAddLit(&configbuf, "ra-param=*,0,0\n");
     }
 
     if (wantDNS) {