[pkg-lighttpd] r321 - lighttpd/trunk/debian

[madcoder at alioth.debian.org]

Author: madcoder
Date: 2008-04-13 11:03:00 +0000 (Sun, 13 Apr 2008)
New Revision: 321

Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/init.d
Log:
Closes: 472122.



Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog	2008-04-13 10:52:16 UTC (rev 320)
+++ lighttpd/trunk/debian/changelog	2008-04-13 11:03:00 UTC (rev 321)
@@ -14,6 +14,9 @@
   * Fix typo in lighttpd.preinst causing failure to update 05-auth symlink
     properly (Closes: 472119).
 
+  * init.d: stopping an already stopped lighttpd, or starting an already
+    running one should not fail (Closes: 472122).
+
  -- Pierre Habouzit <madcoder at debian.org>  Thu, 20 Mar 2008 00:53:45 +0100
 
 lighttpd (1.4.19-1~bpo40+1) etch-backports; urgency=low

Modified: lighttpd/trunk/debian/init.d
===================================================================
--- lighttpd/trunk/debian/init.d	2008-04-13 10:52:16 UTC (rev 320)
+++ lighttpd/trunk/debian/init.d	2008-04-13 11:03:00 UTC (rev 321)
@@ -34,8 +34,9 @@
 case "$1" in
   start)
 	log_daemon_msg "Starting $DESC" $NAME
-	if ! start-stop-daemon --start --quiet\
-	--pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS ; then
+	if ! start-stop-daemon --start --quiet --oknodo \
+            --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
+        then
             log_end_msg 1
 	else
             log_end_msg 0
@@ -43,8 +44,9 @@
     ;;
   stop)
 	log_daemon_msg "Stopping $DESC" $NAME
-	if start-stop-daemon --quiet --stop --oknodo --retry 30\
-	--pidfile $PIDFILE --exec $DAEMON; then
+	if start-stop-daemon --quiet --stop --oknodo --retry 30 --oknodo \
+            --pidfile $PIDFILE --exec $DAEMON
+        then
 	    rm -f $PIDFILE
 	    log_end_msg 0
 	else
@@ -53,8 +55,9 @@
 	;;
   reload)
 	log_daemon_msg "Reloading $DESC configuration" $NAME
-	if start-stop-daemon --stop --signal 2 --oknodo --retry 30\
-	--quiet --pidfile $PIDFILE --exec $DAEMON; then
+	if start-stop-daemon --stop --signal 2 --oknodo --retry 30 --oknodo \
+            --quiet --pidfile $PIDFILE --exec $DAEMON
+        then
 	    if start-stop-daemon --start --quiet  \
 		--pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS ; then
 		log_end_msg 0