From c965e8d3f0e15efa0c426b68b43fa493d68af84b Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 2 Feb 2024 11:25:40 +0100
Subject: [PATCH] dhcp: set RemoveAdvOnExit to off in CARP mode #7194

---
 src/etc/inc/plugins.inc.d/dhcpd.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/etc/inc/plugins.inc.d/dhcpd.inc b/src/etc/inc/plugins.inc.d/dhcpd.inc
index 51c710aed..d15ba6267 100644
--- a/src/etc/inc/plugins.inc.d/dhcpd.inc
+++ b/src/etc/inc/plugins.inc.d/dhcpd.inc
@@ -303,6 +303,8 @@ function dhcpd_radvd_configure($verbose = false, $blacklist = [])
         if ($carp_mode) {
             /* to avoid wrong MAC being stuck during failover */
             $radvdconf .= "\tAdvSourceLLAddress off;\n";
+            /* to avoid final advertisement with zero router lifetime */
+            $radvdconf .= "\tRemoveAdvOnExit off;\n";
         }
 
         /* VIPs may duplicate readings from system */