rpms/vdr/devel vdr.spec, 1.23.2.8, 1.23.2.9 vdr.sysconfig, 1.5.2.3, 1.5.2.4 vdr-runvdr.sh, 1.5, 1.5.2.1

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10576

Modified Files:
      Tag: vdr-1_6-test
	vdr.spec vdr.sysconfig vdr-runvdr.sh 
Log Message:
Don't reload DVB drivers by default on unexpected exits in runvdr.


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.23.2.8
retrieving revision 1.23.2.9
diff -u -r1.23.2.8 -r1.23.2.9
--- vdr.spec	7 Apr 2008 15:05:47 -0000	1.23.2.8
+++ vdr.spec	7 Apr 2008 15:08:19 -0000	1.23.2.9
@@ -490,6 +490,7 @@
 - Apply "unofficial" timercmd patch from HoochVDR.
 - Apply Luca Olivetti's DXR3 subtitle compatibility patch.
 - Decrease default wakeup delay before a timed recording to 10 minutes.
+- Don't reload DVB drivers by default on unexpected exits in runvdr.
 
 * Sun Apr  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-0.4
 - Obsolete vdr-subtitles.


Index: vdr.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.sysconfig,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -r1.5.2.3 -r1.5.2.4
--- vdr.sysconfig	7 Apr 2008 15:05:47 -0000	1.5.2.3
+++ vdr.sysconfig	7 Apr 2008 15:08:19 -0000	1.5.2.4
@@ -57,6 +57,10 @@
 #
 WAKEUP_BEFORE_RECORDING=10
 
+# Try reloading DVB modules on unexpected exits?
+#
+#RELOAD_DVB=yes
+
 # For debugging: allow vdr to dump core.  Note that depending on the operating
 # environment, core dumps from setuid processes may be a security issue.
 # Core dumps requires also the --userdump argument to vdr.


Index: vdr-runvdr.sh
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr-runvdr.sh,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- vdr-runvdr.sh	17 Mar 2008 19:53:15 -0000	1.5
+++ vdr-runvdr.sh	7 Apr 2008 15:08:19 -0000	1.5.2.1
@@ -57,6 +57,7 @@
 
 reload_dvb()
 {
+    log "Reloading DVB modules"
     modules=$(/sbin/lsmod | grep ^dvb_core | awk '{ print $4 }' | tr , ' ')
     /sbin/modprobe -r $modules dvb_core
     for module in $modules ; do
@@ -74,7 +75,7 @@
             ulimit -S -c $DAEMON_COREFILE_LIMIT >/dev/null 2>&1 && \
                 cd ${TMPDIR:-/tmp}
         fi
-        export VDR_WAKEUP_BEFORE_RECORDING
+        export WAKEUP_BEFORE_RECORDING RELOAD_DVB
         build_cmdline
     fi
 
@@ -89,7 +90,7 @@
             ;;
         *)
             log "VDR exited with status $rc, attempting restart"
-            reload_dvb
+            case $RELOAD_DVB in yes|true|1) reload_dvb ;; esac
             ;;
     esac