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

[Olaf van der Spek]

Author: olafvdspek-guest
Date: 2010-05-22 19:20:53 +0000 (Sat, 22 May 2010)
New Revision: 439

Modified:
   lighttpd/trunk/debian/lighttpd.init
Log:
clean up init script


Modified: lighttpd/trunk/debian/lighttpd.init
===================================================================
--- lighttpd/trunk/debian/lighttpd.init	2010-05-22 18:25:12 UTC (rev 438)
+++ lighttpd/trunk/debian/lighttpd.init	2010-05-22 19:20:53 UTC (rev 439)
@@ -36,7 +36,7 @@
 case "$1" in
     start)
         log_daemon_msg "Starting $DESC" $NAME
-        if ! start-stop-daemon --start --quiet --oknodo \
+        if ! start-stop-daemon --start --oknodo --quiet \
             --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
         then
             log_end_msg 1
@@ -46,7 +46,7 @@
         ;;
     stop)
         log_daemon_msg "Stopping $DESC" $NAME
-        if start-stop-daemon --quiet --stop --oknodo --retry 30 --oknodo \
+        if start-stop-daemon --stop --retry 30 --oknodo --quiet \
             --pidfile $PIDFILE --exec $DAEMON
         then
             rm -f $PIDFILE
@@ -57,8 +57,8 @@
         ;;
     reload|force-reload)
         log_daemon_msg "Reloading $DESC configuration" $NAME
-        if start-stop-daemon --stop --signal 2 --oknodo --retry 30 --oknodo \
-            --quiet --pidfile $PIDFILE --exec $DAEMON
+        if start-stop-daemon --stop --signal INT --retry 30 --oknodo --quiet \
+            --pidfile $PIDFILE --exec $DAEMON
         then
             if start-stop-daemon --start --quiet  \
                 --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS ; then
@@ -72,8 +72,6 @@
         ;;
     restart)
         $0 stop
-        test -r  $PIDFILE && while pidof lighttpd | \
-            grep -q `cat $PIDFILE 2>/dev/null` 2>/dev/null ; do sleep 1; done
         $0 start
         ;;
     status)