vdr/vdr/debian changelog plugin-loader.sh vdr.init

[Tobias Grimm]

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

Modified Files:
	changelog plugin-loader.sh vdr.init 
Log Message:
order.conf should be always in PLUGIN_CFG_DIR

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/changelog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- changelog	2 Oct 2004 18:14:31 -0000	1.49
+++ changelog	3 Oct 2004 17:45:47 -0000	1.50
@@ -9,6 +9,8 @@
       default file to the init script
     - fixed bug in shutdown script (OSD messages have to be deferred until
       the shutdown script is finished)
+    - removed PLUGIN_ORDER_FILE paramter, order.conf should always be in
+      PLUGIN_CFG_DIR
   * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
     - Added german (de.po) debconf-translation from Jens Nachtigall 
       <nachtigall@web.de> (closes: #273643)

Index: plugin-loader.sh
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/plugin-loader.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- plugin-loader.sh	3 Sep 2004 10:49:39 -0000	1.14
+++ plugin-loader.sh	3 Oct 2004 17:45:48 -0000	1.15
@@ -57,9 +57,9 @@
         installed_plugins=( "${installed_plugins[@]}" )
     fi
 
-    if [ -r $PLUGIN_ORDER_FILE ]; then
+    if [ -r "$PLUGIN_CFG_DIR/order.conf" ]; then
 	# load plugin order
-	plugin_order=( `cat $PLUGIN_ORDER_FILE | sed "s/#.*$//"` )
+	plugin_order=( `cat $PLUGIN_CFG_DIR/order.conf | sed "s/#.*$//"` )
 
 	# move ordered plugins to list of ordered plugins
 	for plugin in ${plugin_order[@]}; do

Index: vdr.init
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.init,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- vdr.init	26 Sep 2004 17:52:17 -0000	1.27
+++ vdr.init	3 Oct 2004 17:45:48 -0000	1.28
@@ -15,9 +15,6 @@
 # Plugin prefix
 PLUGIN_PREFIX="libvdr-"
 
-# Plugin order configuration
-PLUGIN_ORDER_FILE="/etc/vdr/plugins/order.conf"
-
 # Command-Hooks Directory
 CMDHOOKSDIR="/usr/share/vdr/command-hooks"