Re: [libvirt PATCH 08/17] network: assume DNSMASQ_CAPS_RA_PARAM

[Laine Stump]

On 12/14/21 2:09 PM, Ján Tomko wrote:

Introduced by:


"Introduced by dnsmasq commit:"



commit c4cd95df68b573b63d234ecdb675228657d65353
Author: Simon Kelley 
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 
---
  src/network/bridge_driver.c | 6 ++
  1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index dffe4e1574..a4535b1b49 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -1197,10 +1197,8 @@ networkDnsmasqConfContents(virNetworkObj *obj,
  if (def->forward.type == VIR_NETWORK_FORWARD_NONE) {
  virBufferAddLit(, "dhcp-option=3\n"
  "no-resolv\n");
-if (dnsmasqCapsGet(caps, DNSMASQ_CAPS_RA_PARAM)) {
-/* interface=* (any), interval=0 (default), lifetime=0 (seconds) */
-virBufferAddLit(, "ra-param=*,0,0\n");
-}
+/* interface=* (any), interval=0 (default), lifetime=0 (seconds) */
+virBufferAddLit(, "ra-param=*,0,0\n");
  }
  
  if (wantDNS) {

[libvirt PATCH 08/17] network: assume DNSMASQ_CAPS_RA_PARAM

[Ján Tomko]

Introduced by:
commit c4cd95df68b573b63d234ecdb675228657d65353
Author: Simon Kelley 
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 
---
 src/network/bridge_driver.c | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index dffe4e1574..a4535b1b49 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -1197,10 +1197,8 @@ networkDnsmasqConfContents(virNetworkObj *obj,
 if (def->forward.type == VIR_NETWORK_FORWARD_NONE) {
 virBufferAddLit(, "dhcp-option=3\n"
 "no-resolv\n");
-if (dnsmasqCapsGet(caps, DNSMASQ_CAPS_RA_PARAM)) {
-/* interface=* (any), interval=0 (default), lifetime=0 (seconds) */
-virBufferAddLit(, "ra-param=*,0,0\n");
-}
+/* interface=* (any), interval=0 (default), lifetime=0 (seconds) */
+virBufferAddLit(, "ra-param=*,0,0\n");
 }
 
 if (wantDNS) {
-- 
2.31.1