]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
rstp: systemd unit file had an invalid command.
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 14 Nov 2011 13:21:17 +0000 (14:21 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 14 Nov 2011 13:21:17 +0000 (14:21 +0100)
rstp/rstp.nm
rstp/systemd/rstp.service

index 6bbc3ff14c2449cb74a63baf50a68652a92a0486..9903d1e39ab156fd134e9000d9a2f7c2344ce8d9 100644 (file)
@@ -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 || :
index d322a39222d28309c6c09fd00b291e849c5c78da..b9d6021e630f0495bfe7077c94e105363a27479d 100644 (file)
@@ -4,7 +4,6 @@ Before=network.service
 
 [Service]
 RemainAfterExit=yes
-ExecStartPre=/sbin/modprobe net_pf_17
 ExecStart=/sbin/rstpd -d
 
 [Install]