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

diff --git a/varnish-cache/redhat/varnish.initrc b/varnish-cache/redhat/varnish.initrc
index 1910974d72c95c7d33b12d380e845df1fbcf10d3..def874d229e9a7d4fa5f35ccf4c7bddd85bb67ef 100755 (executable)
--- 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 329651f038a28d55297340977c096419d0ac091d..58745a1619651d576b805bf12e1143b23a3d71c3 100644 (file)
--- 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 ]