packages: c-icap/c-icap.init - use pidfile for killproc and status

[hawk]

Author: hawk                         Date: Tue Mar 22 13:28:57 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use pidfile for killproc and status

---- Files affected:
packages/c-icap:
   c-icap.init (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/c-icap/c-icap.init
diff -u packages/c-icap/c-icap.init:1.1 packages/c-icap/c-icap.init:1.2
--- packages/c-icap/c-icap.init:1.1	Mon Mar 21 10:56:02 2011
+++ packages/c-icap/c-icap.init	Tue Mar 22 14:28:52 2011
@@ -8,7 +8,7 @@
 # description:	c-icap ICAP server
 #
 # processname:	c-icap
-# pidfile:	/var/run/c-icap.pid
+# pidfile:	/var/run/c-icap/c-icap.pid
 # config:	/etc/c-icap/c-icap.conf
 
 # Source function library
@@ -20,6 +20,9 @@
 # Get service config
 [ -f /etc/sysconfig/c-icap ] && . /etc/sysconfig/c-icap
 
+# Default pidfile location
+c_icap_pidfile="/var/run/c-icap/c-icap.pid"
+
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
 	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status -a "$1" != init ]; then
@@ -46,7 +49,7 @@
 	if [ -f /var/lock/subsys/c-icap ]; then
 		# Stop daemons.
 		msg_stopping c-icap
-		killproc c-icap
+		killproc --pidfile $c_icap_pidfile c-icap
 		rm -f /var/lock/subsys/c-icap >/dev/null 2>&1
 	else
 		msg_not_running c-icap
@@ -97,7 +100,7 @@
 	reload
 	;;
   status)
-	status c-icap
+	status --pidfile $c_icap_pidfile c-icap
 	exit $?
 	;;
   *)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/c-icap/c-icap.init?r1=1.1&r2=1.2&f=u