r2818 - vdr/vdr/trunk/debian

[Tobias Grimm]

Author: tiber-guest
Date: 2006-06-04 13:10:39 +0000 (Sun, 04 Jun 2006)
New Revision: 2818

Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/vdr.init
Log:
Increased timeout for stopping the VDR daemon from 5 to 30 seconds, because
VDR may take pretty long to shut down gracefully


Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2006-06-03 19:18:44 UTC (rev 2817)
+++ vdr/vdr/trunk/debian/changelog	2006-06-04 13:10:39 UTC (rev 2818)
@@ -9,6 +9,8 @@
     - SHUTDOWNCMD in vdr-shurdown is now executed detached, so that VDR does not
       block and can cleanly shutdown when receiving SIGTERM
       (Thanks to Hanno Müller for pointing this out!)
+    - Increased timeout for stopping the VDR daemon from 5 to 30 seconds, because
+      VDR may take pretty long to shut down gracefully
     - Moved some of the default values in vdr.default to the config loader
       and added description to README.Debian
 

Modified: vdr/vdr/trunk/debian/vdr.init
===================================================================
--- vdr/vdr/trunk/debian/vdr.init	2006-06-03 19:18:44 UTC (rev 2817)
+++ vdr/vdr/trunk/debian/vdr.init	2006-06-04 13:10:39 UTC (rev 2818)
@@ -48,10 +48,10 @@
 
 stopvdr()
 {
-    if start-stop-daemon --stop --retry 5 \
+    if start-stop-daemon --stop --retry 30 \
         --name $(basename $DAEMON) --pidfile $PIDFILE >/dev/null
     then
-        start-stop-daemon --stop --retry 5 --oknodo --exec $VDRPRG-kbd >/dev/null
+        start-stop-daemon --stop --retry 30 --oknodo --exec $VDRPRG-kbd >/dev/null
         rm -f $PIDFILE
     else
         echo -n " - seems not to be running"