4 files changed, 22 insertions, 28 deletions
diff --git a/main/iperf3/APKBUILD b/main/iperf3/APKBUILD
index c0e75773e60..870c671ab4f 100644
--- a/main/iperf3/APKBUILD
+++ b/main/iperf3/APKBUILD
@@ -3,15 +3,15 @@
 pkgname=iperf3
 _pkgname=iperf
 pkgver=3.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool to measure IP bandwidth using UDP or TCP"
 url="https://github.com/esnet/iperf"
 arch="all"
 license="BSD-3-Clause"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/esnet/$_pkgname/archive/$pkgver.tar.gz
-	$_pkgname.initd
-	$_pkgname.confd
+	$pkgname.initd
+	$pkgname.confd
 
 	build-fixes.patch
 	remove-pg-flags.patch
@@ -38,14 +38,14 @@ check() {
 package() {
 	make DESTDIR="$pkgdir" install
 
-	install -Dm755 "$srcdir"/$_pkgname.initd \
-		"$pkgdir"/etc/init.d/$_pkgname
-	install -Dm644 "$srcdir"/$_pkgname.confd \
-		"$pkgdir"/etc/conf.d/$_pkgname
+	install -Dm755 "$srcdir"/$pkgname.initd \
+		"$pkgdir"/etc/init.d/$pkgname
+	install -Dm644 "$srcdir"/$pkgname.confd \
+		"$pkgdir"/etc/conf.d/$pkgname
 }
 
 sha512sums="4a861a506d7e37958e1af62d1634d11c4937d5974bfce636d421aa80c88f038c96738d9e196a7667e38ef515f998b467d4ff3db30af7e3efea8d9ac8a63a61e7  iperf3-3.7.tar.gz
-339fb04b41cce11e8ea8694d95c13af9c88e0d1143356d913ec810c9b11efa27212d585b5dcc49cc2eb860a6d8bc557092c8659d7d5cfe532c5afdb36f8eedf8  iperf.initd
-fb5e155fff568a72488cc1511d30358835a48bcce309f8f46d040160932b4a4ccb85040c27c60dee477900a25bd34c50eac21d1d0bea984b40faa401be2ba7e8  iperf.confd
+fdaf06316886ae02a865848ea6df6b77aecde78fab15bcbc22e077871c3f567521eeee19ef13c402fef467c2edd916a7d976a4c933dbfb637373145a18563ef9  iperf3.initd
+4c6b766c154612f5f2e5f6150396f443ba37ec59ed0a8a994bf84612059db22827aee3dd3b7c3249e0bb6037163788d830efcb1caad5eba1c97d2349bdbc55f9  iperf3.confd
 aef39e45bf63341b724b9131d8bfdf96702acc059e10d7d502053effa69a03097f64e9ba2a26c6a1e3e1567cf9a95013fc58b3b47623de79add14230bd820fa0  build-fixes.patch
 9334d51ec4bb4931272f972a83109dadd44123c9b46803a5b2d16e725576b860f93b62ae3d85be2a2d8a955cff24211da7675fe733a4f3ad8aaae005939a4097  remove-pg-flags.patch"
diff --git a/main/iperf3/iperf.initd b/main/iperf3/iperf.initd
deleted file mode 100644
index a135bafc92f..00000000000
--- a/main/iperf3/iperf.initd
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-
-command="/usr/bin/iperf"
-pidfile="/var/run/$SVCNAME/$SVCNAME.pid"
-
-depend() {
-	need net
-	after firewall
-}
-
-start() {
-	ebegin "Starting $SVCNAME"
-	start-stop-daemon --start --make-pid --user ${exec_user:-nobody} \
-		--pidfile ${pidfile} --background --exec $command \
-		-- --server ${command_args}
-	eend
-}
-
diff --git a/main/iperf3/iperf.confd b/main/iperf3/iperf3.confd
index 1f425faa674..d8bbac8cf09 100644
--- a/main/iperf3/iperf.confd
+++ b/main/iperf3/iperf3.confd
@@ -1,3 +1,3 @@
-# Default option for iperf: --server (runs in TCP/5001 mode)
+# Default option for iperf3: --server (runs in TCP/5201 mode)
 # For further server options check --help flag
 command_args=""
diff --git a/main/iperf3/iperf3.initd b/main/iperf3/iperf3.initd
new file mode 100644
index 00000000000..ab059746ee6
--- /dev/null
+++ b/main/iperf3/iperf3.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+
+supervisor=supervise-daemon
+
+command="/usr/bin/iperf3"
+command_args="--server $command_args"
+description="A tool for performing network throughput measurements"
+
+depend() {
+	need net
+	after firewall
+}