From ef2e5d7552569b64f9269bc9ff75250f9ff565b8 Mon Sep 17 00:00:00 2001
From: ingvar <ingvar@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Fri, 29 Aug 2008 21:38:01 +0000
Subject: [PATCH] Red Hat init scripts: Fix previous fix. Makes rpmlint happy.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3150 d4fa192b-c00b-0410-8231-f00ffab90ce4
---
 varnish-cache/redhat/varnish.initrc    | 2 +-
 varnish-cache/redhat/varnishlog.initrc | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/varnish-cache/redhat/varnish.initrc b/varnish-cache/redhat/varnish.initrc
index 1910974d..def874d2 100755
--- a/varnish-cache/redhat/varnish.initrc
+++ b/varnish-cache/redhat/varnish.initrc
@@ -26,11 +26,11 @@ pidfile=/var/run/varnish.pid
 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() {
 
diff --git a/varnish-cache/redhat/varnishlog.initrc b/varnish-cache/redhat/varnishlog.initrc
index 329651f0..58745a16 100644
--- a/varnish-cache/redhat/varnishlog.initrc
+++ b/varnish-cache/redhat/varnishlog.initrc
@@ -32,8 +32,6 @@ DAEMON_OPTS="-a -w $logfile -D -P $pidfile"
 # Include varnish defaults
 [ -e /etc/sysconfig/varnishlog ] && . /etc/sysconfig/varnishlog
 
-lockfile=/var/lock/subsys/$prog
-
 start() {
 
 	if [ ! -x $exec ]
-- 
2.39.5