r2817 - vdr/vdr/trunk/debian
Tobias Grimm
tiber-guest at costa.debian.org
Sat Jun 3 19:18:45 UTC 2006
Author: tiber-guest
Date: 2006-06-03 19:18:44 +0000 (Sat, 03 Jun 2006)
New Revision: 2817
Modified:
vdr/vdr/trunk/debian/README.Debian
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/config-loader.sh
vdr/vdr/trunk/debian/vdr-shutdown
vdr/vdr/trunk/debian/vdr.default
Log:
- Stripped default SHUTDOWNCMD to "shutdown -h now"
- SHUTDOWNCMD in vdr-shurdown is now executed detached, so that VDR does not
block and can cleanly shutdown when receiving SIGTERM
(Thanks to Hanno M?\195?\131?\197?\146ller for pointing this out!)
- Moved some of the default values in vdr.default to the config loader
and added description to README.Debian
Modified: vdr/vdr/trunk/debian/README.Debian
===================================================================
--- vdr/vdr/trunk/debian/README.Debian 2006-06-03 11:13:33 UTC (rev 2816)
+++ vdr/vdr/trunk/debian/README.Debian 2006-06-03 19:18:44 UTC (rev 2817)
@@ -22,6 +22,70 @@
-- Thomas Schmidt <tschmidt at debian.org>, Tue, 28 Dec 2004 14:22:21 +0100
+Additonal configuration options
+-------------------------------
+
+The following options can be configured in /etc/default/vdr.
+
+NONPTL=<0|1>
+
+ Default: 1
+
+ Change this to 0 if you want to allow VDR to use NPTL (if available). This is
+ disabled by default, although it should be safe to enable it.
+ (This has no effect on AMD64 machines.)
+
+PLUGIN_CHECK_PATCHLEVEL="<yes|no>"
+
+ Default: "no"
+
+ Set this to "yes" to force VDR to load only plugins with a matching patch
+ level. This is especially useful, if you run patched VDR versions from third
+ party repositories like the ctvdr dirstribution.
+
+PLUGIN_CHECK_STARTABLE="<yes|no>"
+
+ Default: "yes"
+
+ Before starting VDR with the plugins, the loadability of the plugin
+ libraries will be checked with "vdr -V -P plugin". This will catch
+ some binary incompatibilties and problems with the plugins
+ initialization code. Set this to "no" to load the plugins without
+ any testing.
+
+SHUTDOWNCMD="<COMMAND>"
+
+ Default: "/sbin/shutdown -h now"
+
+ VDR executes <COMMAND> when the power-off-key of the remote is pressed after
+ processing all shutdown hook scripts. Shutdown hooks may override this
+ command. See section "Shutdown-Hooks" below. SHUTDOWNCMD will be executed
+ detached in background.
+
+SVDRP_PORT=<PORT>
+
+ Default: 2001
+
+ Default port for SVDRP (Simple Video Disk Recorder Protocol), the telnet
+ like interface to control VDR.
+
+USER=<USERNAME>
+
+ Default: vdr
+
+ Username under which vdr will run. All plugins and commands invoked by VDR
+ will be executed with this users rights.
+
+
+VIDEO_DIR="<VIDEODIR>"
+
+ Default: "/var/lib/video.00"
+
+ The video directory where vdr recordings will be stored.
+
+ -- Tobias Grimm <tg at e-tobi.net>, Sat, 03 Jun 2006 19:00:00 +0100
+
+
Automatic Loading of Plugins
----------------------------
Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog 2006-06-03 11:13:33 UTC (rev 2816)
+++ vdr/vdr/trunk/debian/changelog 2006-06-03 19:18:44 UTC (rev 2817)
@@ -4,6 +4,13 @@
* Thomas Günther <tom at toms-cafe.de>
- Upgraded opt-24_jumpplay-0.8.dpatch to opt-24_jumpplay-0.9.dpatch
+ * Tobias Grimm <tg at e-tobi.net>
+ - Stripped default SHUTDOWNCMD to "shutdown -h now"
+ - SHUTDOWNCMD in vdr-shurdown is now executed detached, so that VDR does not
+ block and can cleanly shutdown when receiving SIGTERM
+ (Thanks to Hanno Müller for pointing this out!)
+ - Moved some of the default values in vdr.default to the config loader
+ and added description to README.Debian
-- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Sun, 28 May 2006 21:03:39 +0200
Modified: vdr/vdr/trunk/debian/config-loader.sh
===================================================================
--- vdr/vdr/trunk/debian/config-loader.sh 2006-06-03 11:13:33 UTC (rev 2816)
+++ vdr/vdr/trunk/debian/config-loader.sh 2006-06-03 19:18:44 UTC (rev 2817)
@@ -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"
+SHUTDOWNCMD="/sbin/shutdown -h now"
# EPG data file
EPG_FILE=/var/cache/vdr/epg.data
@@ -50,4 +50,13 @@
# (This has no effect on AMD64 machines.)
NONPTL=1
+# Video-Directory
+VIDEO_DIR="/var/lib/video.00"
+
+# Set this to load only plugins with the correct patch level
+PLUGIN_CHECK_PATCHLEVEL="no"
+
+# Set this to load only startable plugins (check with "vdr -V -P plugin")
+PLUGIN_CHECK_STARTABLE="yes"
+
test -f /etc/default/vdr && . /etc/default/vdr
Modified: vdr/vdr/trunk/debian/vdr-shutdown
===================================================================
--- vdr/vdr/trunk/debian/vdr-shutdown 2006-06-03 11:13:33 UTC (rev 2816)
+++ vdr/vdr/trunk/debian/vdr-shutdown 2006-06-03 19:18:44 UTC (rev 2817)
@@ -51,4 +51,4 @@
fi
done
-eval $SHUTDOWNCMD
+eval $SHUTDOWNCMD &
Modified: vdr/vdr/trunk/debian/vdr.default
===================================================================
--- vdr/vdr/trunk/debian/vdr.default 2006-06-03 11:13:33 UTC (rev 2816)
+++ vdr/vdr/trunk/debian/vdr.default 2006-06-03 19:18:44 UTC (rev 2817)
@@ -1,4 +1,7 @@
# /etc/default/vdr
+#
+# See also /usr/share/doc/README.Debian
+#
# Change to 1 to enable vdr's init-script
ENABLED=0
@@ -7,25 +10,6 @@
# computer
ENABLE_SHUTDOWN=0
-# Video-Directory
-VIDEO_DIR="/var/lib/video.00"
-
-# Set this to load only startable plugins (check with "vdr -V -P plugin")
-PLUGIN_CHECK_STARTABLE="yes"
-
-# Set this to load only plugins with the correct patch level
-PLUGIN_CHECK_PATCHLEVEL="no"
-
# Options that will be passed to vdr's commandline
# for example: OPTIONS="-w 15"
OPTIONS="-w 60"
-
-# 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"
-
-# Change this to 0 if you want to allow VDR to use NPTL (if available).
-# This is disabled by default, although it should be safe to enable it.
-# (This has no effect on AMD64 machines.)
-NONPTL=1
More information about the pkg-vdr-dvb-changes
mailing list