[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 74e19a563c34ada957056a5db3ba4049f9f17c45

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 3951 bytes --]

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  74e19a563c34ada957056a5db3ba4049f9f17c45 (commit)
       via  f8bf19c92e8b99b097754847f85cc17509135731 (commit)
       via  a4420101a8b1f755b4ca825e3fd0e3cd3fde0414 (commit)
      from  6cab8977e03b5795a240d3b21db0a2387d83aaa8 (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 74e19a563c34ada957056a5db3ba4049f9f17c45
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Nov 20 13:47:01 2020 +0000

    core153: Ship network-hotplug-bridges
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit f8bf19c92e8b99b097754847f85cc17509135731
Author: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
Date:   Thu Nov 19 14:18:49 2020 +0100

    Core 152: the script "network-hotplug-bridges" now reads the variable ${ZONE}_STP from /var/ipfire/ethernet/settings so that STP can be turned on and off for each bridge
    
    Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit a4420101a8b1f755b4ca825e3fd0e3cd3fde0414
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Thu Nov 19 20:01:19 2020 +0100

    Core 153: Ship libhtp
    
    libhtp has been updated and suricata 6 requires the new version, so
    this lib has to be shipped with the core update.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/153/filelists/files                   | 1 +
 config/rootfiles/{oldcore/131 => core/153}/filelists/libhtp | 0
 config/udev/network-hotplug-bridges                         | 4 +++-
 3 files changed, 4 insertions(+), 1 deletion(-)
 copy config/rootfiles/{oldcore/131 => core/153}/filelists/libhtp (100%)

Difference in files:
diff --git a/config/rootfiles/core/153/filelists/files b/config/rootfiles/core/153/filelists/files
index 10a19f870..2f7edf6c5 100644
--- a/config/rootfiles/core/153/filelists/files
+++ b/config/rootfiles/core/153/filelists/files
@@ -5,6 +5,7 @@ etc/rc.d/init.d/network
 etc/rc.d/init.d/unbound
 etc/system-release
 etc/sysctl.conf
+lib/udev/network-hotplug-bridges
 srv/web/ipfire/cgi-bin/connections.cgi
 srv/web/ipfire/cgi-bin/country.cgi
 srv/web/ipfire/cgi-bin/credits.cgi
diff --git a/config/rootfiles/core/153/filelists/libhtp b/config/rootfiles/core/153/filelists/libhtp
new file mode 120000
index 000000000..676e2c5e8
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/libhtp
@@ -0,0 +1 @@
+../../../common/libhtp
\ No newline at end of file
diff --git a/config/udev/network-hotplug-bridges b/config/udev/network-hotplug-bridges
index 33d6d65ba..7431377bb 100644
--- a/config/udev/network-hotplug-bridges
+++ b/config/udev/network-hotplug-bridges
@@ -81,6 +81,7 @@ MODE="$(get_value "${ZONE}_MODE")"
 
 # The name of the virtual bridge
 BRIDGE="$(get_value "${ZONE}_DEV")"
+STP="$(get_value "${ZONE}_STP")"
 
 case "${MODE}" in
 	bridge)
@@ -89,7 +90,8 @@ case "${MODE}" in
 
 		# 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
+			ip link add "${BRIDGE}" address "${ADDRESS}" type bridge \
+				$([ "${STP}" = "on" ] && echo "stp_state 1")
 			#ip link set "${BRIDGE}" up
 		fi
 


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