From ed5b9129d7a47adaecdce694cec8e7b61131a9da Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Tue, 23 Jul 2019 12:06:29 +0200 Subject: [PATCH] base-files: implement generic service_running MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit DRY is good, otherwise we're going to suffer with a copy&paste disease in the init scripts. Signed-off-by: Petr Å tetiar --- package/base-files/files/etc/rc.common | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common index 75dbeedf34..37adab0c54 100755 --- a/package/base-files/files/etc/rc.common +++ b/package/base-files/files/etc/rc.common @@ -95,7 +95,9 @@ service_data() { } service_running() { - return 0 + local service="${1:-$(basename $initscript)}" + local instance="${2:-*}" + procd_running "$service" "$instance" "$@" } ${INIT_TRACE:+set -x} @@ -104,6 +106,9 @@ ${INIT_TRACE:+set -x} [ -n "$USE_PROCD" ] && { EXTRA_COMMANDS="${EXTRA_COMMANDS} running trace" + EXTRA_HELP="\ + running Check if service is running + " . $IPKG_INSTROOT/lib/functions/procd.sh basescript=$(readlink "$initscript") -- 2.25.1