From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 14 Nov 2011 13:21:17 +0000 (+0100)
Subject: rstp: systemd unit file had an invalid command.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=426ef9664001ecc2b6624579476eac8991843620;p=ipfire-3.x.git

rstp: systemd unit file had an invalid command.
---

diff --git a/rstp/rstp.nm b/rstp/rstp.nm
index 6bbc3ff14..9903d1e39 100644
--- a/rstp/rstp.nm
+++ b/rstp/rstp.nm
@@ -5,7 +5,7 @@
 
 name       = rstp
 version    = 0.21
-release    = 7
+release    = 8
 
 groups     = Networking/Tools
 url        = http://git.ipfire.org/?p=thirdparty/rstp.git;a=summary
@@ -25,12 +25,15 @@ build
 
 	install
 		make install INSTALLPREFIX=%{BUILDROOT}
-		install -v -m 755 %{DIR_SOURCE}/bridge-stp %{BUILDROOT}/sbin/bridge-stp
+
+		rm -vf %{BUILDROOT}/sbin/bridge-stp
 	end
 end
 
 packages
 	package %{name}
+		requires = network
+
 		script postin
 			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 			/bin/systemctl --no-reload enable rstp.service >/dev/null 2>&1 || :
diff --git a/rstp/systemd/rstp.service b/rstp/systemd/rstp.service
index d322a3922..b9d6021e6 100644
--- a/rstp/systemd/rstp.service
+++ b/rstp/systemd/rstp.service
@@ -4,7 +4,6 @@ Before=network.service
 
 [Service]
 RemainAfterExit=yes
-ExecStartPre=/sbin/modprobe net_pf_17
 ExecStart=/sbin/rstpd -d
 
 [Install]