From 75117cba492c305209575610562590d537967dfb Mon Sep 17 00:00:00 2001 From: Erik Karlsson Date: Mon, 5 Feb 2024 20:22:12 +0100 Subject: [PATCH] testnet: start from init script and add missing dependency --- testnet/Makefile | 1 + testnet/files/etc/hotplug.d/iface/05-testnet | 6 +---- testnet/files/etc/init.d/testnet | 23 ++++++++++++++++++++ 3 files changed, 25 insertions(+), 5 deletions(-) create mode 100755 testnet/files/etc/init.d/testnet diff --git a/testnet/Makefile b/testnet/Makefile index 9ff1054dd..582306752 100644 --- a/testnet/Makefile +++ b/testnet/Makefile @@ -10,6 +10,7 @@ include $(INCLUDE_DIR)/package.mk define Package/testnet CATEGORY:=Utilities TITLE:=Check WAN IP Connection + DEPENDS:=+ndisc6 endef define Package/testnet/description diff --git a/testnet/files/etc/hotplug.d/iface/05-testnet b/testnet/files/etc/hotplug.d/iface/05-testnet index d6a5180ea..4e3e3c24c 100644 --- a/testnet/files/etc/hotplug.d/iface/05-testnet +++ b/testnet/files/etc/hotplug.d/iface/05-testnet @@ -14,8 +14,4 @@ interface_check() { } interface_check -if [ -n "$(pgrep -f testnet)" ]; then - testnet once -else - testnet & -fi +/etc/init.d/testnet reload diff --git a/testnet/files/etc/init.d/testnet b/testnet/files/etc/init.d/testnet new file mode 100755 index 000000000..ae82f89ee --- /dev/null +++ b/testnet/files/etc/init.d/testnet @@ -0,0 +1,23 @@ +#!/bin/sh /etc/rc.common + +START=21 +STOP=10 +USE_PROCD=1 + +TESTNET=$(which testnet) + +start_service() { + # do not start testnet if the feature is explicitly disabled + [ "$(uci -q get testnet.global.enabled)" = "0" ] && return 0 + + [ -n "$TESTNET" ] && { + procd_open_instance + procd_set_param command "$TESTNET" + procd_set_param respawn + procd_close_instance + } +} + +reload_service() { + [ -n "$TESTNET" ] && procd_running testnet && "$TESTNET" once +}