diff --git a/net/frr/Makefile b/net/frr/Makefile index a3813aca2..46155e8a8 100644 --- a/net/frr/Makefile +++ b/net/frr/Makefile @@ -1,8 +1,7 @@ PLUGIN_NAME= frr -PLUGIN_VERSION= 1.42 -PLUGIN_REVISION= 1 +PLUGIN_VERSION= 1.43 PLUGIN_COMMENT= The FRRouting Protocol Suite -PLUGIN_DEPENDS= frr8 +PLUGIN_DEPENDS= frr8-pythontools PLUGIN_MAINTAINER= ad@opnsense.org PLUGIN_TIER= 2 diff --git a/net/frr/pkg-descr b/net/frr/pkg-descr index 529a3b2c4..3341c9126 100644 --- a/net/frr/pkg-descr +++ b/net/frr/pkg-descr @@ -12,6 +12,14 @@ WWW: https://frrouting.org/ Plugin Changelog ================ +1.43 + +* Use frr-reload instead of restarting the service on configuration changes (opnsense/plugins/issues/4529) +* Migrate separate daemon config files into single frr.conf file (opnsense/plugins/issues/4510) +* Add help texts to all options and expose them in grid as columns (opnsense/plugins/pull/4494) +* Replace deprecated passive-interface directive in ospf (opnsense/plugins/issues/4534) +* Style cleanup and unify forms (opnsense/plugins/pull/4450) + 1.42 * Fix updatesource not rendering when interface has been selected diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/ServiceController.php b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/ServiceController.php index c62632492..9ddce0357 100644 --- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/ServiceController.php +++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/ServiceController.php @@ -41,4 +41,10 @@ class ServiceController extends ApiMutableServiceControllerBase protected static $internalServiceTemplate = 'OPNsense/Quagga'; protected static $internalServiceEnabled = 'enabled'; protected static $internalServiceName = 'quagga'; + + protected function reconfigureForceRestart() + { + // frr can reload using frr-reload and frr8-pythontools + return 0; + } } diff --git a/net/frr/src/opnsense/service/conf/actions.d/actions_quagga.conf b/net/frr/src/opnsense/service/conf/actions.d/actions_quagga.conf index 4c5079caf..aa2e0b70b 100644 --- a/net/frr/src/opnsense/service/conf/actions.d/actions_quagga.conf +++ b/net/frr/src/opnsense/service/conf/actions.d/actions_quagga.conf @@ -17,6 +17,13 @@ type:script message:restarting frr description:Restart FRR +[reload] +command:service frr reload +parameters: +type:script +message:reloading frr +description:Reload FRR + [status] command:/usr/local/etc/rc.d/frr status; exit 0 parameters: