From 23ce9485eac7ff3702322c0ac2d065ffc8c3bc08 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Wed, 23 Nov 2022 14:36:42 +0100
Subject: [PATCH] packages/skeleton-init-finit: sync Finit start scripts with
 myLinux

This adds Finit support for starting chronydy and mstpd, as well as
an update to inadyn supporting env file for custom args.

Also included is a patch to the start script of mstpd for BusyBox pidof,
which don't have the '-c' option.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 .../etc/finit.d/available/chronyd.conf        |  2 ++
 .../etc/finit.d/available/inadyn.conf         |  3 +--
 .../skeleton/etc/finit.d/available/mstpd.conf |  4 +++
 patches/mstpd/0.1.0/busybox-pidof.patch       | 26 +++++++++++++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 package/skeleton-init-finit/skeleton/etc/finit.d/available/chronyd.conf
 create mode 100644 package/skeleton-init-finit/skeleton/etc/finit.d/available/mstpd.conf
 create mode 100644 patches/mstpd/0.1.0/busybox-pidof.patch

diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/chronyd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/chronyd.conf
new file mode 100644
index 00000000..1be306d3
--- /dev/null
+++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/chronyd.conf
@@ -0,0 +1,2 @@
+# Requires /etc/chrony.conf to star, see https://chrony.tuxfamily.org/doc/3.4/chrony.conf.html
+service [2345789] env:-/etc/default/inadyn chronyd -n $CHRONY_ARGS -- Chrony NTP v3/v4 daemon
diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/inadyn.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/inadyn.conf
index c6184b3c..d94e63fe 100644
--- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/inadyn.conf
+++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/inadyn.conf
@@ -1,2 +1 @@
-service [2345] <net/route/default> inadyn -ns -t 30 -- DDNS client
-
+service [2345] <net/route/default> env:-/etc/default/inadyn inadyn -ns $INADYN_ARGS -- In-a-Dyn DDNS client
diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/mstpd.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/mstpd.conf
new file mode 100644
index 00000000..2863ee5f
--- /dev/null
+++ b/package/skeleton-init-finit/skeleton/etc/finit.d/available/mstpd.conf
@@ -0,0 +1,4 @@
+# Make sure to configure the bridge to run on before starting mstpd
+# Note: all 'sysv' type services are handed an extra 'start' or 'stop'
+# argument when starting and stopping.
+sysv name:mstpd [123456789] pid:!/run/mstpd.pid bridge-stp br0 -- MSTP daemon
diff --git a/patches/mstpd/0.1.0/busybox-pidof.patch b/patches/mstpd/0.1.0/busybox-pidof.patch
new file mode 100644
index 00000000..53395ad1
--- /dev/null
+++ b/patches/mstpd/0.1.0/busybox-pidof.patch
@@ -0,0 +1,26 @@
+--- mstpd-0.1.0/bridge-stp.in.orig	2022-02-04 11:49:59.764280663 +0100
++++ mstpd-0.1.0/bridge-stp.in	2022-02-04 11:51:00.212347703 +0100
+@@ -139,7 +139,7 @@
+         fi
+ 
+         # Start mstpd if necessary.
+-        if ! pidof -c -s mstpd >/dev/null; then
++        if ! pidof -s mstpd >/dev/null; then
+             if [ "$MANAGE_MSTPD" != 'y' ]; then
+                 errmsg 'mstpd is not running'
+                 exit 3
+@@ -212,12 +212,12 @@
+         done
+ 
+         # Kill mstpd, since no bridges are currently using it.
+-        kill $(pidof -c mstpd)
++        kill $(pidof mstpd)
+         ;;
+     restart|restart_config)
+         if [ "$action" = 'restart' ]; then
+             # Kill mstpd.
+-            pids="$(pidof -c mstpd)" ; Err=$?
++            pids="$(pidof mstpd)" ; Err=$?
+             if [ $Err -eq 0 ]; then
+                 echo 'Stopping mstpd ...'
+                 kill $pids