From bc76f27505f52564f0b9b64efd72c79bb18d9c16 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 23 Jan 2026 12:44:27 +0100 Subject: [PATCH] net/frr: sync with master --- net/frr/Makefile | 1 + net/frr/pkg-descr | 1 + net/frr/src/etc/rc.syshook.d/carp/50-frr | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/net/frr/Makefile b/net/frr/Makefile index 072f29e7d..8a8f78a19 100644 --- a/net/frr/Makefile +++ b/net/frr/Makefile @@ -1,5 +1,6 @@ PLUGIN_NAME= frr PLUGIN_VERSION= 1.50 +PLUGIN_REVISION= 1 PLUGIN_COMMENT= The FRRouting Protocol Suite PLUGIN_DEPENDS= frr10-pythontools PLUGIN_MAINTAINER= ad@opnsense.org diff --git a/net/frr/pkg-descr b/net/frr/pkg-descr index 311843b09..5a47995ed 100644 --- a/net/frr/pkg-descr +++ b/net/frr/pkg-descr @@ -18,6 +18,7 @@ Plugin Changelog * Fix watchfrr service handling (contributed by Andy Binder) (opnsense/plugins/pull/4712 and 5132) * Add capability support for BGP neighbors (contributed by Shelldog95) (opnsense/plugins/pull/5128) * Prevent errors in diagnostics view when a frr daemon is not started (opnsense/plugins/pull/5119) +* Fix CARP hook service start hang (opnsense/plugins/pull/5160) 1.49 diff --git a/net/frr/src/etc/rc.syshook.d/carp/50-frr b/net/frr/src/etc/rc.syshook.d/carp/50-frr index e028a3e1d..defb3812d 100755 --- a/net/frr/src/etc/rc.syshook.d/carp/50-frr +++ b/net/frr/src/etc/rc.syshook.d/carp/50-frr @@ -49,7 +49,8 @@ if (frr_carp_enabled()) { switch ($type) { case 'MASTER': - mwexecfm('/usr/local/etc/rc.d/frr start'); + // XXX: This will stall if stdout is not redirected + mwexecfm('/usr/local/etc/rc.d/frr start > /dev/null'); break; case 'BACKUP': mwexecfm('/usr/local/etc/rc.d/frr stop');