The following commit has been merged in the master branch:
commit 5185f2d9c3ef1b2b2362d3340292494afba6cc90
Author: Guillem Jover <guil...@debian.org>
Date:   Mon Jan 5 00:07:37 2009 +0200

    s-s-d: Clarify that the signal sent by default is TERM not KILL
    
    Closes: #507568

diff --git a/ChangeLog b/ChangeLog
index be33ceb..44c5122 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-05  Guillem Jover  <guil...@debian.org>
+
+       * man/start-stop-daemon.8: Clarify that the signal sent by default
+       is TERM not KILL.
+
 2009-01-04  Guillem Jover  <guil...@debian.org>
 
        * utils/start-stop-daemon.c (signal_nr): Initialize with SIGTERM
diff --git a/debian/changelog b/debian/changelog
index abaa999..e521faa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,8 @@ dpkg (1.15.0) UNRELEASED; urgency=low
   * Fix typo in package description ('privides' -> 'provides').
     Thanks to Pascal De Vuyst <pascal.devu...@gmail.com>. Closes: #510755
   * Make dpkg log files user readable. Closes: #480556
+  * Clarify in the start-stop-daemon man page that the signal sent by default
+    is TERM not KILL. Closes: #507568
 
   [ Raphael Hertzog ]
   * Enhance dpkg-shlibdeps's error message when a library can't be found to
diff --git a/man/start-stop-daemon.8 b/man/start-stop-daemon.8
index c07411d..7e8bbe2 100644
--- a/man/start-stop-daemon.8
+++ b/man/start-stop-daemon.8
@@ -24,8 +24,8 @@ will scan the process table looking for any processes which
 match the process name, uid, and/or gid (if specified). Any
 matching process will prevent
 .BR \-\-start
-from starting the daemon. All matching processes will be
-sent the KILL signal if
+from starting the daemon. All matching processes will be sent the TERM
+signal (or the one specified via \fB\-\-signal\fP or \fB\-\-retry\fP) if
 .BR \-\-stop
 is specified. For daemons which have long-lived children
 which need to live through a

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to