From: ingvar Date: Tue, 16 Sep 2008 12:25:46 +0000 (+0000) Subject: Fixed pidfile issues in redhat package X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea1a68689114fc5370ffb1b85ec156a11610fc69;p=varnish Fixed pidfile issues in redhat package git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3192 d4fa192b-c00b-0410-8231-f00ffab90ce4 --- diff --git a/varnish-cache/redhat/varnish.initrc b/varnish-cache/redhat/varnish.initrc index def874d2..9b53941f 100755 --- a/varnish-cache/redhat/varnish.initrc +++ b/varnish-cache/redhat/varnish.initrc @@ -61,7 +61,7 @@ start() { return 6 else # Varnish always gives output on STDOUT - daemon --pidfile $pidfile $exec "$DAEMON_OPTS" > /dev/null 2>&1 + daemon --pidfile $pidfile $exec -P $pidfile "$DAEMON_OPTS" > /dev/null 2>&1 retval=$? if [ $retval -eq 0 ] then @@ -77,7 +77,7 @@ start() { stop() { echo -n "Stopping varnish HTTP accelerator: " - killproc $prog + killproc -p $pidfile $prog retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile diff --git a/varnish-cache/redhat/varnish.spec b/varnish-cache/redhat/varnish.spec index a1dace0d..4e5a1baa 100644 --- a/varnish-cache/redhat/varnish.spec +++ b/varnish-cache/redhat/varnish.spec @@ -1,7 +1,7 @@ Summary: Varnish is a high-performance HTTP accelerator Name: varnish Version: 2.0 -Release: 0.9.20080912svn3184%{?dist} +Release: 0.9.20080916svn3192%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.varnish-cache.org/ diff --git a/varnish-cache/redhat/varnishlog.initrc b/varnish-cache/redhat/varnishlog.initrc index e22be7df..54d48d89 100644 --- a/varnish-cache/redhat/varnishlog.initrc +++ b/varnish-cache/redhat/varnishlog.initrc @@ -49,7 +49,7 @@ start() { stop() { echo -n "Stopping varnish logging daemon: " - killproc $prog + killproc -p $pidfile $prog retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile diff --git a/varnish-cache/redhat/varnishncsa.initrc b/varnish-cache/redhat/varnishncsa.initrc index d556f072..8efb1890 100644 --- a/varnish-cache/redhat/varnishncsa.initrc +++ b/varnish-cache/redhat/varnishncsa.initrc @@ -49,7 +49,7 @@ start() { stop() { echo -n "Stopping varnish ncsa logging daemon: " - killproc $prog + killproc -p $pidfile $prog retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile