r1769 - vdr/vdr/trunk/debian

[Thomas Schmidt]

Author: tschmidt
Date: 2006-01-21 15:44:12 +0000 (Sat, 21 Jan 2006)
New Revision: 1769

Modified:
   vdr/vdr/trunk/debian/vdr.init
Log:
Check for existance of /usr/sbin/runvdr and /usr/bin/vdr before sourcing the config-loader.sh script (see: #302826) ;-)

Modified: vdr/vdr/trunk/debian/vdr.init
===================================================================
--- vdr/vdr/trunk/debian/vdr.init	2006-01-21 15:36:12 UTC (rev 1768)
+++ vdr/vdr/trunk/debian/vdr.init	2006-01-21 15:44:12 UTC (rev 1769)
@@ -3,8 +3,6 @@
 # vdr start-stop script
 #
 
-. /usr/lib/vdr/config-loader.sh
-
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 NAME=vdr
 DESC="Linux Video Disk Recorder"
@@ -13,12 +11,14 @@
 PIDFILE=/var/run/runvdr.pid
 VDRPRG=/usr/bin/vdr
 
+test -x $DAEMON || exit 0
+test -x $VDRPRG || exit 0
+
+. /usr/lib/vdr/config-loader.sh
+
 test "$ENABLE_SHUTDOWN" = "1" && VDRSHUTDOWN="/usr/lib/vdr/vdr-shutdown.wrapper" \
         || VDRSHUTDOWN="/usr/lib/vdr/vdr-shutdown-message"
 
-test -x $DAEMON || exit 0
-test -x $VDRPRG || exit 0
-
 . /usr/lib/vdr/plugin-loader.sh
 . /usr/lib/vdr/commands-loader.sh