r3150 - trunk/varnish-cache/redhat

[ingvar at projects.linpro.no]

Author: ingvar
Date: 2008-08-29 23:38:01 +0200 (Fri, 29 Aug 2008)
New Revision: 3150

Modified:
   trunk/varnish-cache/redhat/varnish.initrc
   trunk/varnish-cache/redhat/varnishlog.initrc
Log:
Red Hat init scripts: Fix previous fix. Makes rpmlint happy.

Modified: trunk/varnish-cache/redhat/varnish.initrc
===================================================================
--- trunk/varnish-cache/redhat/varnish.initrc	2008-08-29 20:49:47 UTC (rev 3149)
+++ trunk/varnish-cache/redhat/varnish.initrc	2008-08-29 21:38:01 UTC (rev 3150)
@@ -26,11 +26,11 @@
 exec="/usr/sbin/varnishd"
 prog="varnishd"
 config="/etc/sysconfig/varnish"
+lockfile="/var/lock/subsys/varnish"
 
 # Include varnish defaults
 [ -e /etc/sysconfig/varnish ] && . /etc/sysconfig/varnish
 
-lockfile=/var/lock/subsys/$prog
 
 start() {
 

Modified: trunk/varnish-cache/redhat/varnishlog.initrc
===================================================================
--- trunk/varnish-cache/redhat/varnishlog.initrc	2008-08-29 20:49:47 UTC (rev 3149)
+++ trunk/varnish-cache/redhat/varnishlog.initrc	2008-08-29 21:38:01 UTC (rev 3150)
@@ -32,8 +32,6 @@
 # Include varnish defaults
 [ -e /etc/sysconfig/varnishlog ] && . /etc/sysconfig/varnishlog
 
-lockfile=/var/lock/subsys/$prog
-
 start() {
 
 	if [ ! -x $exec ]