killproc(): fill base and pid variables based on waitname.

svn-id: @5896

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 9f238fa9ad56a963b6cb20c111b45e39f6c992c2..8afd303c90b4286db847388d786a2e8f6dcf0031 100644 (file)
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -617,6 +617,11 @@ killproc()
        fi
        
        if [ -n "$waitname" -a -n "$waittime" ]; then
+               # Save basename.
+               base=$(basename "$waitname")
+               # Find pid.
+               pid=$(pidofproc "$waitname" "$pidfile")
+               [ -z "$pid" ] && pid=$(pidofproc "$base" "$pidfile")
                i=0
                while [ "$i" -lt "$waittime" ]; do
                        i=$(( i + 1 ))