New Astra 19.2 Channellist, moved vdr config to /opt/vdr/etc

config/rootfiles/packages/vdr

@@ -97,12 +97,12 @@ opt/vdr/share/man/man1/vdr.1.gz
 opt/vdr/share/man/man5/vdr.5.gz
 #opt/vdr/video
 #var/video
-var/video/channels.conf
-var/video/diseqc.conf
-var/video/keymacros.conf
+opt/vdr/etc/channels.conf
+opt/vdr/etc/diseqc.conf
+opt/vdr/etc/keymacros.conf
 #var/video/plugins
-var/video/plugins/streamdevhosts.conf
-var/video/setup.conf
-var/video/sources.conf
-var/video/svdrphosts.conf
+opt/vdr/etc/plugins/streamdevhosts.conf
+opt/vdr/etc/setup.conf
+opt/vdr/etc/sources.conf
+opt/vdr/etc/svdrphosts.conf
 etc/rc.d/init.d/vdr

config/vdr/bin/runvdr

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# runvdr: Loads the DVB driver and runs VDR
+#
+# If VDR exits abnormally, the driver will be reloaded
+# and VDR restarted.
+#
+# Any command line parameters will be passed on to the
+# actual 'vdr' program.
+#
+
+VDRPRG="./bin/vdr"
+VDRCMD="$VDRPRG -w 60 -c /opt/vdr/etc -Pstreamdev-server $*"
+
+KILL="killall -q -TERM"
+
+mkdir -p /var/video
+cd /opt/vdr
+while (true) do
+#
+# If you have stability Problems at tuning or similar
+# unload and reload the dvb-modules here ...
+# Example is for Hauppauge Nexus 2.0
+#
+#     rmmod dvb_ttpci
+#     rmmod stv0299
+#     rmmod dvb_core
+#     modprobe dvb_ttpci
+#
+      sleep 1
+      eval "$VDRCMD"
+      if test $? -eq 0 -o $? -eq 2; then exit; fi
+      $KILL $VDRPRG
+      sleep 10
+      echo "`date` restarting VDR"
+done

lfs/vdr

@@ -86,8 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make VIDEODIR=/var/video vdr $(MAKETUNING)
 	cd $(DIR_APP) && make PREFIX=. DESTDIR=/opt/vdr/ install
 	-mkdir -p /var/video/plugins/ 
-	cd $(DIR_APP) && install *.conf /var/video/
-	cp -f $(DIR_SRC)/config/vdr/*.conf /var/video/
-	cp -f $(DIR_SRC)/config/vdr/plugins/*.conf /var/video/plugins/
+	cd $(DIR_APP) && install *.conf /opt/vdr/etc/
+	cp -f $(DIR_SRC)/config/vdr/* /opt/vdr/
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)

src/initscripts/init.d/vdr

@@ -19,11 +19,12 @@ case "${1}" in
 	start)
 		boot_mesg "Starting Video Disk Recorder..."
 		cd /opt/vdr
-		loadproc screen -dmS vdr /opt/vdr/bin/vdr -Pstreamdev-server
+		loadproc screen -dmS vdr /opt/vdr/bin/runvdr
 		;;
 		
 	stop)
 		boot_mesg "Stopping Video Disk Recorder..."
+		killall -s KILL -w runvdr
 		killproc /opt/vdr/bin/vdr
 		;;
 
@@ -34,6 +35,7 @@ case "${1}" in
 		;;
 
 	status)
+		statusproc /opt/vdr/bin/runvdr
 		statusproc /opt/vdr/bin/vdr
 		;;