From 2da22da18bb43783b27d2d522787c9dfe64b188b Mon Sep 17 00:00:00 2001 From: Monviech <79600909+Monviech@users.noreply.github.com> Date: Thu, 5 Jun 2025 08:53:33 +0200 Subject: [PATCH] net/frr: Upgrade from frr8 to frr10 (#4741) * net/frr: Update dependency to frr10 for testing * net/frr: Add mgmtd daemon before zebra as its mandatory in frr10 --- net/frr/Makefile | 2 +- net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/frr/Makefile b/net/frr/Makefile index 0b628771b..e32c37a32 100644 --- a/net/frr/Makefile +++ b/net/frr/Makefile @@ -1,7 +1,7 @@ PLUGIN_NAME= frr PLUGIN_VERSION= 1.45 PLUGIN_COMMENT= The FRRouting Protocol Suite -PLUGIN_DEPENDS= frr8-pythontools +PLUGIN_DEPENDS= frr10-pythontools PLUGIN_MAINTAINER= ad@opnsense.org PLUGIN_TIER= 2 diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr index 7235af510..c9069cd81 100644 --- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr +++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr @@ -6,7 +6,7 @@ frr_enable="YES" {% if helpers.exists('OPNsense.quagga.general.enablecarp') and OPNsense.quagga.general.enablecarp == '1' %} start_precmd="ifconfig | grep 'carp: MASTER'" {% endif %} -frr_daemons="zebra{% +frr_daemons="mgmtd zebra{% if helpers.exists('OPNsense.quagga.ospf.enabled') and OPNsense.quagga.ospf.enabled == '1' %} ospfd{% endif %}{% if helpers.exists('OPNsense.quagga.rip.enabled') and OPNsense.quagga.rip.enabled == '1' %} ripd{% endif %}{% if helpers.exists('OPNsense.quagga.bfd.enabled') and OPNsense.quagga.bfd.enabled == '1' %} bfdd{% endif %}{%