From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 14 Nov 2011 14:09:04 +0000 (+0100)
Subject: stp: Bring own /sbin/bridge-stp.
X-Git-Tag: 004~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30812a007bdeacfa83f0a7cb39bf78eb46e34080;p=people%2Fms%2Fnetwork.git

stp: Bring own /sbin/bridge-stp.

This is doing everything we want for now.
---

diff --git a/Makefile b/Makefile
index 8ca81f31..7d51cc62 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,8 @@ all:
 install:
 	-mkdir -pv $(DESTDIR)/etc/{network/{ports,zones},ppp}
 	-mkdir -pv $(DESTDIR)/lib/{network,sysctl.d,udev}
-	-mkdir -pv $(DESTDIR)/sbin
 	-mkdir -pv $(DESTDIR)/var/log/network
+	-mkdir -pv $(DESTDIR)/sbin
 
 	install -m 755 -v network $(DESTDIR)/sbin
 
@@ -23,6 +23,9 @@ install:
 	cp -rfv udev/* $(DESTDIR)/lib/udev
 	cp -rfv network-* $(DESTDIR)/lib/network/
 
+	# Install bridge-stp. 
+	install -m 755 bridge-stp $(DESTDIR)/sbin/
+
 	install -m 755 -v ppp/ip-updown $(DESTDIR)/etc/ppp
 	ln -svf ip-updown $(DESTDIR)/etc/ppp/ip-pre-up
 	ln -svf ip-updown $(DESTDIR)/etc/ppp/ip-up
diff --git a/bridge-stp b/bridge-stp
new file mode 100755
index 00000000..b00c280c
--- /dev/null
+++ b/bridge-stp
@@ -0,0 +1,31 @@
+#!/bin/sh
+###############################################################################
+#                                                                             #
+# IPFire - An Open Source Firewall Solution                                   #
+# Copyright (C) 2011 IPFire development team                                  #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+# This script always returns 0 to prevent the kernel starting its own stp
+# implementation.
+# But in case no mstpd is not running, an error message will be logged.
+
+. /lib/network/functions
+
+systemctl is-active mstpd.service >/dev/null 2>&1 ||
+	log ERROR "mstpd is not running. STP might not work."
+
+exit 0