From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 9 Aug 2009 17:03:30 +0000 (+0200)
Subject: rstp: Start daemon together with the network.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d48240f815cc0eefb9175b82d22167b7efaccfb8;p=ipfire-3.x.git

rstp: Start daemon together with the network.

Works fine for me, now.
---

diff --git a/lfs/rstp b/lfs/rstp
index 732f06404..c5795c737 100644
--- a/lfs/rstp
+++ b/lfs/rstp
@@ -83,6 +83,9 @@ $(OBJECT): $(objects)
 	cd $(DIR_APP) && sed -e "s/^CFLAGS = .*/& $(CFLAGS)/g" -i Makefile
 	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 	cd $(DIR_APP) && make install
-	cd $(DIR_APP) && cp -vf bridge-stp /sbin
+
+	install -v -m 755 $(DIR_SOURCE)/$(PKG_NAME)/bridge-stp /sbin/bridge-stp
+	$(INSTALL_INITSCRIPT)
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/src/initscripts/extras/rstp.conf b/src/initscripts/extras/rstp.conf
new file mode 100644
index 000000000..8d21d1560
--- /dev/null
+++ b/src/initscripts/extras/rstp.conf
@@ -0,0 +1,11 @@
+description		"Rapid Spanning Tree Protocol Daemon"
+author			"IPFire Team"
+
+start on starting network
+stop on stopped network
+
+pre-start script
+	modprobe net_pf_17
+end script
+
+exec /sbin/rstpd
diff --git a/src/rootfiles/core/rstp b/src/rootfiles/core/rstp
index 2e58b74cd..4a0575956 100644
--- a/src/rootfiles/core/rstp
+++ b/src/rootfiles/core/rstp
@@ -1,3 +1,4 @@
+etc/init/rstp.conf
 sbin/bridge-stp
 sbin/rstpctl
 sbin/rstpd
diff --git a/src/rstp/bridge-stp b/src/rstp/bridge-stp
new file mode 100644
index 000000000..947c12bac
--- /dev/null
+++ b/src/rstp/bridge-stp
@@ -0,0 +1,25 @@
+#!/bin/bash
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007, 2008, 2009 Michael Tremer & Christian Schmidt           #
+#                                                                             #
+# 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.
+
+exit 0