From 37eb27e47dbeb3e94d0415fb6d83e0097721a582 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 2 Jun 2014 12:43:10 +0000 Subject: [PATCH] base-files: remove function service_kill Function service_kill is deprecated and has no user, so remove it. Signed-off-by: Zhao, Gang SVN-Revision: 40912 --- .../base-files/files/lib/functions/service.sh | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/package/base-files/files/lib/functions/service.sh b/package/base-files/files/lib/functions/service.sh index d352a441cc..3d08e1434d 100644 --- a/package/base-files/files/lib/functions/service.sh +++ b/package/base-files/files/lib/functions/service.sh @@ -101,26 +101,3 @@ service_stop() { service_reload() { SERVICE_SIG="${SERVICE_SIG:-$SERVICE_SIG_RELOAD}" service -K "$@" } - -service_kill() { - cat 1>&2 << __END_OF_WARNING__ -# -# WARNING: the 'service_kill' function is now deprecated and might be -# removed soon. Consider using the other new service_* wrappers instead. -# -__END_OF_WARNING__ - local name="${1}" - local pid="${2:-$(pidof "$name")}" - local grace="${3:-5}" - - [ -f "$pid" ] && pid="$(head -n1 "$pid" 2>/dev/null)" - - for pid in $pid; do - [ -d "/proc/$pid" ] || continue - local try=0 - kill -TERM $pid 2>/dev/null && \ - while grep -qs "$name" "/proc/$pid/cmdline" && [ $((try++)) -lt $grace ]; do sleep 1; done - kill -KILL $pid 2>/dev/null && \ - while grep -qs "$name" "/proc/$pid/cmdline"; do sleep 1; done - done -} -- 2.25.1