From 7de5c626512d087a07bbae93df4438828b5e4a57 Mon Sep 17 00:00:00 2001 From: Monviech <79600909+Monviech@users.noreply.github.com> Date: Mon, 17 Feb 2025 17:03:17 +0100 Subject: [PATCH] net/frr: Delete per daemon and old watchfrr files (#4552) * net/frr: Delete per daemon and old watchfrr files, this cleans up remains after the frr.conf migration. Co-authored-by: Franco Fichtner --------- Co-authored-by: Franco Fichtner --- net/frr/pkg-descr | 2 ++ net/frr/src/opnsense/scripts/frr/setup.sh | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/net/frr/pkg-descr b/net/frr/pkg-descr index 3341c9126..6a19f7379 100644 --- a/net/frr/pkg-descr +++ b/net/frr/pkg-descr @@ -16,9 +16,11 @@ Plugin Changelog * 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) +* Delete per daemon and old watchfrr files (opnsense/plugins/issues/4551) * 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) +* Implement base_apply_button (opnsense/plugins/pull/4542) 1.42 diff --git a/net/frr/src/opnsense/scripts/frr/setup.sh b/net/frr/src/opnsense/scripts/frr/setup.sh index f91e271fd..bda37d2c3 100755 --- a/net/frr/src/opnsense/scripts/frr/setup.sh +++ b/net/frr/src/opnsense/scripts/frr/setup.sh @@ -21,3 +21,17 @@ chown $user:$group /var/log/frr.log # register Security Associations /usr/local/opnsense/scripts/frr/register_sas + +# delete stale configuration files from frr.conf migration +files_to_delete=" + /etc/rc.d/watchfrr + /usr/local/etc/frr/bfdd.conf + /usr/local/etc/frr/bgpd.conf + /usr/local/etc/frr/ospfd.conf + /usr/local/etc/frr/ospf6d.conf + /usr/local/etc/frr/ripd.conf + /usr/local/etc/frr/staticd.conf + /usr/local/etc/frr/zebra.conf +" + +rm -f $files_to_delete