298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

base-files: fix service_running check

Browse Source 
The following command checks if a instance of a service is running.
/etc/init.d/<service> running <instance>

 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 <fe@dev.tdt.de>
Reviewed-by: Sungbo Eo <mans0n@gorani.run>
This commit is contained in:
Florian Eckert 2021-06-15 08:48:18 +02:00 committed by coolsnowwolf
parent b498e0ac33
commit bd8d34909d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/base-files/files/etc/rc.common
View File

@ -100,9 +100,9 @@ service_data() {
} }
service_running() { service_running() {
local service="${1:-$(basename $initscript)}" local instance="${1:-*}"
local instance="${2:-*}"
procd_running "$service" "$instance" "$@" procd_running "$(basename $initscript)" "$instance"
} }
${INIT_TRACE:+set -x} ${INIT_TRACE:+set -x}