This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 82973fae144d199c10332a174848db6eaddc1355 (commit) from 74e19a563c34ada957056a5db3ba4049f9f17c45 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 82973fae144d199c10332a174848db6eaddc1355 Author: Daniel Weismüller daniel.weismueller@ipfire.org Date: Fri Nov 20 18:35:52 2020 +0100

network-hotplug-bridges: Apply STP_PRIORITY

Signed-off-by: Daniel Weismüller daniel.weismueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/udev/network-hotplug-bridges | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

Difference in files: diff --git a/config/udev/network-hotplug-bridges b/config/udev/network-hotplug-bridges index 7431377bb..89470fec0 100644 --- a/config/udev/network-hotplug-bridges +++ b/config/udev/network-hotplug-bridges @@ -82,16 +82,22 @@ MODE="$(get_value "${ZONE}_MODE")" # The name of the virtual bridge BRIDGE="$(get_value "${ZONE}_DEV")" STP="$(get_value "${ZONE}_STP")" +STP_PRIORITY="$(get_value "${ZONE}_STP_PRIORITY")"

case "${MODE}" in bridge) + # We need to check if $STP_PRIORITY has a valid value if not set it + if [ -n "${STP_PRIORITY}" ]; then + STP_PRIORITY=16384; + fi + ADDRESS="$(get_value "${ZONE}_MACADDR")" [ -n "${ADDRESS}" ] || ADDRESS="$(random_mac_address)"

# We need to create the bridge if it doesn't exist, yet if [ ! -d "/sys/class/net/${BRIDGE}" ]; then ip link add "${BRIDGE}" address "${ADDRESS}" type bridge \ - $([ "${STP}" = "on" ] && echo "stp_state 1") + $([ "${STP}" = "on" ] && echo "stp_state 1 priority ${STP_PRIORITY}" ) #ip link set "${BRIDGE}" up fi

hooks/post-receive -- IPFire 2.x development tree