From 0160fd539e2c94f2e66b4b06a5b2a069e515231f Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 24 Nov 2024 20:43:28 +0100 Subject: [PATCH] package/skeleton-init-finit: ensure zebra+ospfd log to syslog Fix lack of syslog messages from Zebra and add support to easily enable debug logs for common Zebra subsystems. Same change made to ospfd for symmetry. Signed-off-by: Joachim Wiberg --- board/common/rootfs/etc/default/ospfd | 2 ++ board/common/rootfs/etc/default/zebra | 2 ++ .../skeleton/etc/finit.d/available/frr/ospfd.conf | 3 ++- .../skeleton/etc/finit.d/available/frr/zebra.conf | 3 ++- 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 board/common/rootfs/etc/default/ospfd create mode 100644 board/common/rootfs/etc/default/zebra diff --git a/board/common/rootfs/etc/default/ospfd b/board/common/rootfs/etc/default/ospfd new file mode 100644 index 00000000..38021e3b --- /dev/null +++ b/board/common/rootfs/etc/default/ospfd @@ -0,0 +1,2 @@ +# --log-level debug +OSPFD_ARGS="-A 127.0.0.1 -u frr -g frr -f /etc/frr/ospfd.conf --log syslog" diff --git a/board/common/rootfs/etc/default/zebra b/board/common/rootfs/etc/default/zebra new file mode 100644 index 00000000..5ce4e34c --- /dev/null +++ b/board/common/rootfs/etc/default/zebra @@ -0,0 +1,2 @@ +# --log-level debug +ZEBRA_ARGS="-A 127.0.0.1 -u frr -g frr --log syslog " 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 b7757581..e4652ff1 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 +1,2 @@ -service [2345] log:null ospfd -A 127.0.0.1 -u frr -g frr -f /etc/frr/ospfd.conf -- OSPF daemon +service env:-/etc/default/ospfd \ + [2345] ospfd $OSPFD_ARGS -- OSPF 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 85aa22fd..45d39484 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 +1,2 @@ -service [2345] pid:!/run/frr/zebra.pid zebra -A 127.0.0.1 -u frr -g frr -- Zebra routing daemon +service pid:!/run/frr/zebra.pid env:-/etc/default/zebra \ + [2345] zebra $ZEBRA_ARGS -- Zebra routing daemon