From 9ea1e8272883a62de3f690c61542d6e5d969adaa Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 2 Mar 2026 10:02:22 +0100 Subject: [PATCH] package/skeleton-init-fint: increase zebra netlink buffer Increase Zebra NETLINK buffer to fix reported issues with zebra being out of sync with kernel routes and interface changes. Also, try '-a' option to allow other processes to delete zebra routes. Other changes in this commit: - Minor fixes to Finit service files for consistency - Empty daemon.conf stub files to silence bogus mgmtd errors at startup - Relocate all skeleton files from board/common to separate from files that are actual Infix additions and what's package system integration Signed-off-by: Joachim Wiberg --- package/skeleton-init-finit/skeleton/etc/default/zebra | 2 +- .../skeleton/etc/finit.d/available/frr/mgmtd.conf | 3 ++- .../skeleton/etc/finit.d/available/frr/ospfd.conf | 5 +++-- .../skeleton/etc/finit.d/available/frr/ripd.conf | 4 ++-- .../skeleton/etc/finit.d/available/frr/zebra.conf | 4 ++-- .../skeleton-init-finit/skeleton}/etc/frr/daemons | 4 +--- .../skeleton-init-finit/skeleton}/etc/frr/frr.conf | 0 package/skeleton-init-finit/skeleton/etc/frr/mgmtd.conf | 1 + package/skeleton-init-finit/skeleton/etc/frr/ripd.conf | 1 + package/skeleton-init-finit/skeleton/etc/frr/ripngd.conf | 1 + package/skeleton-init-finit/skeleton/etc/frr/staticd.conf | 1 + package/skeleton-init-finit/skeleton/etc/frr/zebra.conf | 1 + 12 files changed, 16 insertions(+), 11 deletions(-) rename {board/common/rootfs => package/skeleton-init-finit/skeleton}/etc/frr/daemons (72%) rename {board/common/rootfs => package/skeleton-init-finit/skeleton}/etc/frr/frr.conf (100%) create mode 100644 package/skeleton-init-finit/skeleton/etc/frr/mgmtd.conf create mode 100644 package/skeleton-init-finit/skeleton/etc/frr/ripd.conf create mode 100644 package/skeleton-init-finit/skeleton/etc/frr/ripngd.conf create mode 100644 package/skeleton-init-finit/skeleton/etc/frr/staticd.conf create mode 100644 package/skeleton-init-finit/skeleton/etc/frr/zebra.conf diff --git a/package/skeleton-init-finit/skeleton/etc/default/zebra b/package/skeleton-init-finit/skeleton/etc/default/zebra index 4467b9af..13d5e53a 100644 --- a/package/skeleton-init-finit/skeleton/etc/default/zebra +++ b/package/skeleton-init-finit/skeleton/etc/default/zebra @@ -1,2 +1,2 @@ # --log-level debug -ZEBRA_ARGS="-A 127.0.0.1 -u frr -g frr --log syslog --log-level err" +ZEBRA_ARGS="-A 127.0.0.1 -a -s 90000000 -u frr -g frr --log syslog --log-level err" diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/mgmtd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/mgmtd.conf index 825aff9c..fbf2c086 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/mgmtd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/mgmtd.conf @@ -1,2 +1,3 @@ service pid:!/run/frr/mgmtd.pid env:-/etc/default/mgmtd \ - [2345] mgmtd $MGMTD_ARGS -- FRR MGMT daemon + [2345] mgmtd $MGMTD_ARGS \ + -- FRR MGMT daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospfd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospfd.conf index e4652ff1..20b52339 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospfd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ospfd.conf @@ -1,2 +1,3 @@ -service env:-/etc/default/ospfd \ - [2345] ospfd $OSPFD_ARGS -- OSPF daemon +service pid:!/run/frr/ospfd.pid env:-/etc/default/ospfd \ + [2345] ospfd $OSPFD_ARGS \ + -- OSPF daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripd.conf index bb311b58..8a8f9330 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/ripd.conf @@ -1,3 +1,3 @@ -service env:-/etc/default/ripd \ - [2345] ripd $RIPD_ARGS +service pid:!/run/frr/ripd.pid env:-/etc/default/ripd \ + [2345] ripd $RIPD_ARGS \ -- RIP daemon diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/zebra.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/zebra.conf index dce1abca..30b4a166 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/zebra.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/frr/zebra.conf @@ -1,3 +1,3 @@ -service pid:!/run/frr/zebra.pid env:-/etc/default/zebra \ - [2345] zebra $ZEBRA_ARGS +service pid:!/run/frr/zebra.pid env:-/etc/default/zebra \ + [2345] zebra $ZEBRA_ARGS \ -- Zebra routing daemon diff --git a/board/common/rootfs/etc/frr/daemons b/package/skeleton-init-finit/skeleton/etc/frr/daemons similarity index 72% rename from board/common/rootfs/etc/frr/daemons rename to package/skeleton-init-finit/skeleton/etc/frr/daemons index 2094cd75..b8eb4835 100644 --- a/board/common/rootfs/etc/frr/daemons +++ b/package/skeleton-init-finit/skeleton/etc/frr/daemons @@ -1,5 +1,4 @@ -# Default FRR daemons file for Infix - confd overwrites on routing changes. -# watchfrr, zebra, mgmtd, and staticd are always started by frrinit.sh. +# Default FRR daemons file used with watchfrr, started by frrinit.sh. ospfd=no ripd=no bfdd=no @@ -25,4 +24,3 @@ staticd_options="-A 127.0.0.1" bfdd_options=" -A 127.0.0.1" frr_profile="traditional" - diff --git a/board/common/rootfs/etc/frr/frr.conf b/package/skeleton-init-finit/skeleton/etc/frr/frr.conf similarity index 100% rename from board/common/rootfs/etc/frr/frr.conf rename to package/skeleton-init-finit/skeleton/etc/frr/frr.conf diff --git a/package/skeleton-init-finit/skeleton/etc/frr/mgmtd.conf b/package/skeleton-init-finit/skeleton/etc/frr/mgmtd.conf new file mode 100644 index 00000000..12ab4118 --- /dev/null +++ b/package/skeleton-init-finit/skeleton/etc/frr/mgmtd.conf @@ -0,0 +1 @@ +! Empty stub — mgmtd reads its own config at startup; file must exist to avoid log noise. diff --git a/package/skeleton-init-finit/skeleton/etc/frr/ripd.conf b/package/skeleton-init-finit/skeleton/etc/frr/ripd.conf new file mode 100644 index 00000000..0adacf4f --- /dev/null +++ b/package/skeleton-init-finit/skeleton/etc/frr/ripd.conf @@ -0,0 +1 @@ +! Empty stub — mgmtd reads per-daemon configs at startup; file must exist to avoid log noise. diff --git a/package/skeleton-init-finit/skeleton/etc/frr/ripngd.conf b/package/skeleton-init-finit/skeleton/etc/frr/ripngd.conf new file mode 100644 index 00000000..0adacf4f --- /dev/null +++ b/package/skeleton-init-finit/skeleton/etc/frr/ripngd.conf @@ -0,0 +1 @@ +! Empty stub — mgmtd reads per-daemon configs at startup; file must exist to avoid log noise. diff --git a/package/skeleton-init-finit/skeleton/etc/frr/staticd.conf b/package/skeleton-init-finit/skeleton/etc/frr/staticd.conf new file mode 100644 index 00000000..0adacf4f --- /dev/null +++ b/package/skeleton-init-finit/skeleton/etc/frr/staticd.conf @@ -0,0 +1 @@ +! Empty stub — mgmtd reads per-daemon configs at startup; file must exist to avoid log noise. diff --git a/package/skeleton-init-finit/skeleton/etc/frr/zebra.conf b/package/skeleton-init-finit/skeleton/etc/frr/zebra.conf new file mode 100644 index 00000000..0adacf4f --- /dev/null +++ b/package/skeleton-init-finit/skeleton/etc/frr/zebra.conf @@ -0,0 +1 @@ +! Empty stub — mgmtd reads per-daemon configs at startup; file must exist to avoid log noise.