lsb 3.2-20 Debian release.

diff --git a/debian/changelog b/debian/changelog
index 90e9409e7164a7e9bb2bf71186f2f4c361527162..799b29f0b38bb49c0c6a5e0a9577e2313302efd4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+lsb (3.2-20) unstable; urgency=low
+
+  * Revert change in 3.2-16 that broke killproc due to my misunderstanding
+    of the spec.  (Closes: #495587)
+  * pidofproc now also checks for /var/run/$base.pid if -p is not specified,
+    fixing conformance with the spec.
+
+ -- Chris Lawrence <lawrencc@debian.org>  Mon, 18 Aug 2008 16:34:24 -0500
+
 lsb (3.2-19) unstable; urgency=low
 
   * Return 0 in log_failure_msg too.

diff --git a/init-functions b/init-functions
index 3d6847c57771e2186bfb4193e3f572af6e9180d8..4d99df00340bf30655e45378025868448a969b56 100644 (file)
--- a/init-functions
+++ b/init-functions
@@ -71,6 +71,11 @@ pidofproc () {
     done
     shift $(($OPTIND - 1))
 
+    base=${1##*/}
+    if [ ! "$specified" ]; then
+        pidfile="/var/run/$base.pid"
+    fi
+
     if [ -n "${pidfile:-}" -a -e "$pidfile" ]; then
         read pid < "$pidfile"
         if [ -n "${pid:-}" ]; then
@@ -113,7 +118,7 @@ killproc () {
 
     base=${1##*/}
     if [ ! $pidfile ]; then
-        name_param="--name $base"
+        name_param="--name $base --pidfile /var/run/$base.pid"
     else
         name_param="--pidfile $pidfile"
     fi