From d50fc1f4a737e3e86ee8c65fc8f0a2f26eca23d5 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Sat, 5 Aug 2023 14:40:57 +0200 Subject: [PATCH] net/frr - fix rc issue, frr_setup isn't called, but _setup is called for each sub service. let's tag this on zebra_setup as this will always be executed first. for https://github.com/opnsense/plugins/issues/3521 --- net/frr/Makefile | 1 + net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/net/frr/Makefile b/net/frr/Makefile index d07fdad5a..716674418 100644 --- a/net/frr/Makefile +++ b/net/frr/Makefile @@ -1,5 +1,6 @@ PLUGIN_NAME= frr PLUGIN_VERSION= 1.34 +PLUGIN_REVISION= 2 PLUGIN_COMMENT= The FRRouting Protocol Suite PLUGIN_DEPENDS= frr8 PLUGIN_MAINTAINER= franz.fabian.94@gmail.com diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr index d95013c2f..a740765bc 100644 --- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr +++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr @@ -1,5 +1,5 @@ {% if helpers.exists('OPNsense.quagga.general.enabled') and OPNsense.quagga.general.enabled == '1' %} -frr_setup="/usr/local/opnsense/scripts/quagga/setup.sh" +zebra_setup="/usr/local/opnsense/scripts/quagga/setup.sh" frr_enable="YES" {% if helpers.exists('OPNsense.quagga.general.enablecarp') and OPNsense.quagga.general.enablecarp == '1' %} start_precmd="ifconfig | grep 'carp: MASTER'"