summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArno Töll <arno@debian.org>2013-10-30 12:18:14 +0100
committerArno Töll <arno@debian.org>2013-10-30 12:18:14 +0100
commit9679c2dc7c0098b667c0ea8bbf309d5ae60a6cc3 (patch)
tree92e124cb885059e5ff485b6b13e63f3a275791fc
parent681842c9783f01636825fe3902199e491767d47c (diff)
downloadlighttpd-9679c2dc7c0098b667c0ea8bbf309d5ae60a6cc3.tar.gz
Wait for the process to terminate on reload in the init script
-rw-r--r--debian/changelog6
-rw-r--r--debian/lighttpd.init3
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 0835471..873b79e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lighttpd (1.4.33-2) UNRELEASED; urgency=low
+
+ * Make the init script wait until lighttpd really terminates.
+
+ -- Arno Töll <arno@debian.org> Wed, 30 Oct 2013 12:15:29 +0100
+
lighttpd (1.4.33-1) unstable; urgency=low
* Drop the connection-dos.patch - merged upstream.
diff --git a/debian/lighttpd.init b/debian/lighttpd.init
index ef62e1f..6fb6dbb 100644
--- a/debian/lighttpd.init
+++ b/debian/lighttpd.init
@@ -70,7 +70,8 @@ case "$1" in
check_syntax
log_daemon_msg "Reloading $DESC configuration" $NAME
if start-stop-daemon --stop --signal INT --quiet \
- --pidfile $PIDFILE --exec $DAEMON
+ --pidfile $PIDFILE --exec $DAEMON \
+ --retry=TERM/60/KILL/5
then
rm $PIDFILE
if start-stop-daemon --start --quiet \