The following commit has been merged in the master branch:
commit 09e696654a8cf58477e148cc2d9eb496cf8a72f4
Author: Guillem Jover <guil...@debian.org>
Date:   Sun Jan 4 23:57:58 2009 +0200

    s-s-d: Use SIGTERM instead of literal 15

diff --git a/ChangeLog b/ChangeLog
index afa8b7d..be33ceb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-01-04  Guillem Jover  <guil...@debian.org>
 
+       * utils/start-stop-daemon.c (signal_nr): Initialize with SIGTERM
+       instead of literal 15.
+       * man/start-stop-daemon.8: Refer to signal as TERM instead of
+       literal 15.
+
+2009-01-04  Guillem Jover  <guil...@debian.org>
+
        * lib/dpkg.h (LOCALLIBDIR): Move macro to ...
        * dselect/Makefile.am (INCLUDES): ... here, as a -D argument.
 
diff --git a/man/start-stop-daemon.8 b/man/start-stop-daemon.8
index 5941751..c07411d 100644
--- a/man/start-stop-daemon.8
+++ b/man/start-stop-daemon.8
@@ -1,4 +1,4 @@
-.TH start\-stop\-daemon 8 "2008-01-30" "Debian Project" "dpkg utilities"
+.TH start\-stop\-daemon 8 "2009-01-04" "Debian Project" "dpkg utilities"
 .SH NAME
 start\-stop\-daemon \- start and stop system daemon programs
 .
@@ -105,7 +105,7 @@ Change to \fIgroup\fP or \fIgid\fP when starting the 
process.
 .BR \-s ", " \-\-signal " \fIsignal\fP"
 With
 .BR \-\-stop ,
-specifies the signal to send to processes being stopped (default 15).
+specifies the signal to send to processes being stopped (default TERM).
 .TP
 .BR \-R ", " \-\-retry " \fItimeout\fP|\fIschedule\fP"
 With
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 10c15f4..5a5c921 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -110,7 +110,7 @@ static int start = 0;
 static int stop = 0;
 static int background = 0;
 static int mpidfile = 0;
-static int signal_nr = 15;
+static int signal_nr = SIGTERM;
 static int user_id = -1;
 static int runas_uid = -1;
 static int runas_gid = -1;

-- 
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