vdr/vdr/debian changelog runvdr

[Thomas Schmidt]

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

Modified Files:
	changelog runvdr 
Log Message:
improved runvdr-scrit

Index: runvdr
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/runvdr,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- runvdr	17 Jul 2004 12:13:55 -0000	1.5
+++ runvdr	17 Oct 2004 10:42:35 -0000	1.6
@@ -5,13 +5,23 @@
 OPTIONS="$*"
 VDRCMD="LD_ASSUME_KERNEL=2.4 /usr/bin/vdr $OPTIONS"
 
-KVERS=`uname -r | grep -e '2.6'`
-if [ -z "$KVERS" ]; then
-	MODULES=`lsmod | grep dvb-core | cut -d'[' -f2 | cut -d']' -f1`
-else
-	MODULES=`lsmod | grep ^dvb_core | awk '{print $4;}' | awk '{ gsub(/,/," ", $1); print }'`
-fi
-								
+function get_modulenames ()
+{
+   KVERS=`uname -r | grep -e '2.6'`
+   if [ -z "$KVERS" ]; then
+      MODULES=`lsmod | grep dvb-core | cut -d'[' -f2 | cut -d']' -f1`
+   else
+      MODULES=`lsmod | grep ^dvb_core | awk '{print $4;}' | awk '{ gsub(/,/," ", $1); print }'`
+   fi
+}
+
+get_modulenames
+
+if [ -z "$MODULES" ]; then					# If no DVB-Modules were found, try to load
+   modprobe dvb > /dev/null 2>&1			# the module with the name dvb, this could
+   get_modulenames							# be an alias for the dvb-ttpci-module or
+fi													# another dvb-module
+
 MODULES="$MODULES dvb-core"
 
 while (true) do

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/changelog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- changelog	3 Oct 2004 17:45:47 -0000	1.50
+++ changelog	17 Oct 2004 10:42:35 -0000	1.51
@@ -14,6 +14,9 @@
   * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
     - Added german (de.po) debconf-translation from Jens Nachtigall 
       <nachtigall@web.de> (closes: #273643)
+    - Improved runvdr-script: try to load the module dvb, which could be
+      an alias for the real dvb-module, when no loaded dvb-modules were
+      found.
 
  -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sun, 15 Aug 2004 18:00:00 +0200