[package] dropbear: performance improvements in init script, quiet mode for start...

[openwrt/svn-archive/archive.git] / package / dropbear / files / dropbear.init

diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index 36c37001c1f598d94c0713c9f97f5e339bf39298..85a90d02fded9b8f768f7a153994ee662096d820 100755 (executable)
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -1,10 +1,11 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 # Copyright (C) 2006 Carlos Sobrinho
 
 NAME=dropbear
 PROG=/usr/sbin/dropbear
 START=50
+STOP=50
 PIDCOUNT=0
 EXTRA_COMMANDS="killclients"
 EXTRA_HELP="   killclients Kill ${NAME} processes except servers and yourself"
@@ -90,7 +91,7 @@ stop()
        local pidfile
        for pidfile in `ls /var/run/${NAME}.*.pid`
         do
-               start-stop-daemon -K -s KILL -p "${pidfile}" -n "${NAME}" >/dev/null
+               start-stop-daemon -q -K -s KILL -p "${pidfile}" -n "${NAME}"
                rm -f "${pidfile}"
        done
        [ -z "${pidfile}" ] && echo "${initscript}: no pid files, if you get problems with start then try killclients"
@@ -111,12 +112,10 @@ killclients()
                [ "${pid}" -eq 0 ] && break
 
                # check if client connection
-               ps | grep -e "^[ ]*${pid} " | grep "${PROG}" >/dev/null
-               if [ $? -eq 0 ]
-                then
+               grep -F -q -e "${PROG}" "/proc/${pid}/cmdline" && {
                        append ignore "${pid}"
                        break
-               fi
+               }
        done
 
        # get all server pids that should be ignored
@@ -129,9 +128,10 @@ killclients()
        local skip
        for pid in `pidof "${NAME}"`
         do
-               # check if correct program
-               ps | grep -e "^[ ]*${pid} " | grep "${PROG}" >/dev/null
-               [ $? -ne 0 ] && continue
+               # check if correct program, otherwise process next pid
+               grep -F -q -e "${PROG}" "/proc/${pid}/cmdline" || {
+                       continue
+               }
 
                # check if pid should be ignored (servers, ourself)
                skip=0