From 26d06bd13b5cdcbf53b84fca79b2f959d4a8ca2f Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 10 Dec 2024 13:30:03 +0100 Subject: [PATCH] skeleton: mstpd: Let /sbin/bridge-stp add/remove bridges --- package/skeleton-init-finit/skeleton/etc/bridge-stp.conf | 3 +++ package/skeleton-init-finit/skeleton/etc/default/mstpd | 3 +++ .../skeleton/etc/finit.d/available/mstpd.conf | 8 ++++---- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 package/skeleton-init-finit/skeleton/etc/bridge-stp.conf create mode 100644 package/skeleton-init-finit/skeleton/etc/default/mstpd diff --git a/package/skeleton-init-finit/skeleton/etc/bridge-stp.conf b/package/skeleton-init-finit/skeleton/etc/bridge-stp.conf new file mode 100644 index 00000000..ccfef53b --- /dev/null +++ b/package/skeleton-init-finit/skeleton/etc/bridge-stp.conf @@ -0,0 +1,3 @@ +# Daemon is managed by finit(1), /sbin/bridge-stp should assume that +# it is already running and simply add/remove bridges as necessary +MANAGE_MSTPD='n' diff --git a/package/skeleton-init-finit/skeleton/etc/default/mstpd b/package/skeleton-init-finit/skeleton/etc/default/mstpd new file mode 100644 index 00000000..4afe12e9 --- /dev/null +++ b/package/skeleton-init-finit/skeleton/etc/default/mstpd @@ -0,0 +1,3 @@ +# -d: Do _not_ [sic] daemonize +# -s: Log to syslog +MSTPD_ARGS="-d -s" diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/mstpd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/mstpd.conf index bae2749b..d2278d50 100644 --- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/mstpd.conf +++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/mstpd.conf @@ -1,4 +1,4 @@ -# Make sure to configure the bridge to run on before starting mstpd -# Note: all 'sysv' type services are handed an extra 'start' or 'stop' -# argument when starting and stopping. -sysv name:mstpd [0123456] pid:!/run/mstpd.pid bridge-stp br0 -- MSTP daemon +# A single mstpd instance can manage multiple bridges, which are +# dynamically added/removed by the kernel via the /sbin/bridge-stp +# usermode helper. +service [S0123456789] env:-/etc/default/mstpd mstpd $MSTPD_ARGS -- Spanning Tree daemon