tags 661602 patch thank you A debdiff with a patch that fixes this bug is attached.
Cheers, -- Jonathan Davies | Canonical Ltd. www.canonical.com | www.ubuntu.com
diff -Nru varnish-3.0.2/debian/changelog varnish-3.0.2/debian/changelog --- varnish-3.0.2/debian/changelog 2012-05-01 15:22:42.000000000 +0100 +++ varnish-3.0.2/debian/changelog 2012-06-18 20:13:43.000000000 +0100 @@ -1,3 +1,11 @@ +varnish (3.0.2-3) unstable; urgency=low + + * varnish.init: + - Remove PID file on stop (Closes: #661602). + - Use start-stop-daemon for status. + + -- Jonathan Davies <[email protected]> Mon, 18 Jun 2012 20:09:10 +0100 + varnish (3.0.2-2) unstable; urgency=low [ Knut Arne Bjørndal ] diff -Nru varnish-3.0.2/debian/varnish.init varnish-3.0.2/debian/varnish.init --- varnish-3.0.2/debian/varnish.init 2012-05-01 15:22:42.000000000 +0100 +++ varnish-3.0.2/debian/varnish.init 2012-06-18 20:07:59.000000000 +0100 @@ -73,6 +73,15 @@ else log_end_msg 1 fi + + if test -r $PIDFILE; then + read -r PID < $PIDFILE + if test ! -d /proc/$PID ; then + # stale pidfile + unset PID + rm -f $PIDFILE + fi + fi } reload_varnishd() { @@ -85,7 +94,9 @@ } status_varnishd() { - status_of_proc -p "${PIDFILE}" "${DAEMON}" "${NAME}" + start-stop-daemon \ + --status --quiet --pidfile $PIDFILE \ + --exec $DAEMON exit $? }
