From dbe2a6343f906ddf48142ee72eb81b3f311cfe6f Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 15 Jun 2021 08:48:18 +0200 Subject: [PATCH] base-files: fix service_running check The following command checks if a instance of a service is running. /etc/init.d/ running In the variable `$@`, which is passed to the function `service_running`, the first argument is always the `instance` which should be checked. Because all other variables where removed from `$@` with `shift`. Before this change the first argument of `$@` was set to the `$service` Variable. So the function does not work as expected. The `$service` variable was always the instance which should be checked. This is not what we want. Signed-off-by: Florian Eckert Reviewed-by: Sungbo Eo (cherry picked from commit dd681838d370f1f6f6fa1bf1f22b0414322292f3) --- package/base-files/files/etc/rc.common | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common index f39b69464ea..5d0d3c23f74 100755 --- a/package/base-files/files/etc/rc.common +++ b/package/base-files/files/etc/rc.common @@ -100,9 +100,9 @@ service_data() { } service_running() { - local service="${1:-$(basename $initscript)}" - local instance="${2:-*}" - procd_running "$service" "$instance" "$@" + local instance="${1:-*}" + + procd_running "$(basename $initscript)" "$instance" } ${INIT_TRACE:+set -x} -- 2.30.2