From 618e80a06a6c032d09bc9cfa333fde893ec9f8d1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 10 Apr 2022 01:58:41 +0200 Subject: [PATCH] oonf-olsrd2: add support to check if service is running MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Maciej Krüger --- oonf-init-scripts/files/oonf_init.sh | 17 +++++++++++++++++ oonf-olsrd2/Makefile | 2 +- oonf-olsrd2/files/olsrd2.init | 3 +++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/oonf-init-scripts/files/oonf_init.sh b/oonf-init-scripts/files/oonf_init.sh index 8ab5b3b..a945c4e 100755 --- a/oonf-init-scripts/files/oonf_init.sh +++ b/oonf-init-scripts/files/oonf_init.sh @@ -118,3 +118,20 @@ reload() oonf_add_devices_to_configuration oonf_reread_config } + +running() +{ + # check if we have a pidfile and then check if that pid still exists. + # since we don't use -e this has to be explicitly returned. exit would stop the process. + test -e "/tmp/run/olsrd2.pid" && test -e "/proc/$(cat "/tmp/run/olsrd2.pid")" && return 0 + return 1 +} + +status() +{ + if running; then + echo "running" + else + echo "stopped" + fi +} diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile index 9494cb3..38c6383 100644 --- a/oonf-olsrd2/Makefile +++ b/oonf-olsrd2/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oonf-olsrd2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/OLSR/OONF.git diff --git a/oonf-olsrd2/files/olsrd2.init b/oonf-olsrd2/files/olsrd2.init index 04b30ff..59795c2 100755 --- a/oonf-olsrd2/files/olsrd2.init +++ b/oonf-olsrd2/files/olsrd2.init @@ -5,4 +5,7 @@ DAEMON='olsrd2' [ -n "$IPKG_INSTROOT" ] || { . /lib/functions/oonf_init.sh + + extra_command "running" "Check if service is running" + extra_command "status" "Service status" } -- 2.30.2