rstp: Add systemd unit file.

Dropping support for upstart.

References #149.

diff --git a/pkgs/rstp/rstp.init b/pkgs/rstp/rstp.init
deleted file mode 100644 (file)
index 5d968b0..0000000
--- a/pkgs/rstp/rstp.init
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-expect fork
-respawn

diff --git a/pkgs/rstp/rstp.nm b/pkgs/rstp/rstp.nm
index 8762a4a9d38e65ef4ab8189055610e515ed9d2c7..3fbf6a3cbc276d92ea36a505ff8c7910308df33a 100644 (file)
--- a/pkgs/rstp/rstp.nm
+++ b/pkgs/rstp/rstp.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = rstp
 PKG_VER        = 0.21
-PKG_REL        = 0
+PKG_REL        = 1
 
 PKG_MAINTAINER =
 PKG_GROUPS     = Networking/Tools

diff --git a/pkgs/rstp/systemd/rstp.service b/pkgs/rstp/systemd/rstp.service
new file mode 100644 (file)
index 0000000..f501ad2
--- /dev/null
+++ b/pkgs/rstp/systemd/rstp.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Rapid Spanning Tree Protocol Daemon
+Before=network.service
+
+[Service]
+RemainAfterExit=yes
+ExecPreStart=/sbin/modprobe net_pf_17
+ExecStart=/sbin/rstpd -d
+
+[Install]
+WantedBy=multi-user.target