fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base-files,procd: add generic service status

Browse Source 
Adds a default status action for init.d scripts.

procd "service status" will return:

 0) for loaded services (even if disabled by conf or dead)
 3) for inactive services
 4) when filtering a non-existing instance

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
[rebased, cleaned up]
Signed-off-by: Petr Štetiar <ynezz@true.cz>

Part of the commit content is already in system/procd/files.
This commit is contained in:
Luiz Angelo Daros de Luca 2018-09-11 22:35:09 -03:00 committed by AmadeusGhost
parent 81f41e0d58
commit 06a87652ff
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,9 +105,10 @@ ${INIT_TRACE:+set -x}
. "$initscript" . "$initscript"
[ -n "$USE_PROCD" ] && { [ -n "$USE_PROCD" ] && {
EXTRA_COMMANDS="${EXTRA_COMMANDS} running trace" EXTRA_COMMANDS="${EXTRA_COMMANDS} running status trace"
EXTRA_HELP="\ EXTRA_HELP="\
running Check if service is running running Check if service is running
status Service status
" "
. $IPKG_INSTROOT/lib/functions/procd.sh . $IPKG_INSTROOT/lib/functions/procd.sh
@ -153,6 +154,14 @@ ${INIT_TRACE:+set -x}
running() { running() {
service_running "$@" service_running "$@"
} }
status() {
if eval "type status_service" 2>/dev/null >/dev/null; then
status_service "$@"
else
_procd_status "$(basename ${basescript:-$initscript})" "$1"
fi
}
} }
ALL_COMMANDS="start stop reload restart boot shutdown enable disable enabled depends ${EXTRA_COMMANDS}" ALL_COMMANDS="start stop reload restart boot shutdown enable disable enabled depends ${EXTRA_COMMANDS}"