vdr/vdr/debian config-loader.sh vdr-shutdown vdr.default vdr.init

[Tobias Grimm]

Update of /cvsroot/pkg-vdr-dvb/vdr/vdr/debian
In directory haydn:/tmp/cvs-serv25849

Modified Files:
	config-loader.sh vdr-shutdown vdr.default vdr.init 
Log Message:
load config before anything else

Index: vdr.default
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.default,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- vdr.default	27 Nov 2004 20:53:38 -0000	1.16
+++ vdr.default	5 Jan 2005 20:56:10 -0000	1.17
@@ -22,4 +22,4 @@
 # VDR executes this command when the power-off-key of the remote is
 # pressed after processing all shutdown hook scripts. Shutdown hooks
 # may override this command - see /usr/share/doc/vdr/README.Debian.
-SHUTDOWNCMD="/etc/init.d/vdr stop ; sleep 1 ; /sbin/shutdown -h now"
+SHUTDOWN_CMD="/etc/init.d/vdr stop ; sleep 1 ; /sbin/shutdown -h now"

Index: vdr-shutdown
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr-shutdown,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- vdr-shutdown	5 Jan 2005 20:48:05 -0000	1.8
+++ vdr-shutdown	5 Jan 2005 20:56:10 -0000	1.9
@@ -51,4 +51,4 @@
     fi
 done 
 
-eval $SHUTDOWNCMD
+eval $SHUTDOWN_CMD

Index: config-loader.sh
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/config-loader.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config-loader.sh	5 Jan 2005 20:48:05 -0000	1.3
+++ config-loader.sh	5 Jan 2005 20:56:10 -0000	1.4
@@ -26,7 +26,7 @@
 REC_CMD=/usr/lib/vdr/vdr-recordingaction
 
 # Commmand executed by vdr to shutdown the system
-SHUTDOWNCMD="/etc/init.d/vdr stop ; sleep 1 ; /sbin/shutdown -h now"
+SHUTDOWN_CMD="/etc/init.d/vdr stop ; sleep 1 ; /sbin/shutdown -h now"
 
 # EPG data file
 EPG_FILE=/var/cache/vdr/epg.data

Index: vdr.init
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.init,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- vdr.init	5 Jan 2005 20:48:05 -0000	1.32
+++ vdr.init	5 Jan 2005 20:56:10 -0000	1.33
@@ -3,12 +3,12 @@
 # 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"
 VDRSHUTDOWN=/usr/lib/vdr/vdr-shutdown
-
-. /usr/lib/vdr/config-loader.sh
 
 test "$ENABLED" != "0" || exit 0