vdr/vdr/debian changelog config-loader.sh vdr.default vdr.init vdr.NEWS vdr-shutdown
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Fri, 14 Jan 2005 11:25:45 +0000
Update of /cvsroot/pkg-vdr-dvb/vdr/vdr/debian
In directory haydn:/tmp/cvs-serv31289/vdr/vdr/debian
Modified Files:
changelog config-loader.sh vdr.default vdr.init vdr.NEWS
vdr-shutdown
Log Message:
* disable automatic shutdown of vdr by default and document this
* changed $SHUTDOWN_CMD to $SHUTDOWNCMD again
Index: vdr.NEWS
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.NEWS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- vdr.NEWS 30 Dec 2004 21:10:28 -0000 1.5
+++ vdr.NEWS 14 Jan 2005 11:25:43 -0000 1.6
@@ -1,9 +1,14 @@
vdr (1.2.6-6) unstable; urgency=low
The most important change in this release is that vdr from now on
- will run under the username vdr, not as root, the video-directory
- (/var/lib/video.00) and configfiles will be changed at installation,
- so they are owned by the user vdr and the group vdr.
+ will run under the username vdr, not as root, this is due to some
+ security problems when vdr runs as root, the video-directory and
+ configfiles will be changed at installation, so they are owned by
+ the user and group vdr.
+
+ The second thing is that the automatic shutdown of vdr is now disabled
+ by default, you can enable it again by changing ENABLE_SHUTDOWN to 1
+ in /etc/default/vdr.
In this release we also changed the default VIDEO_DIR from
/var/lib/video to /var/lib/video.00, to make adding extra harddiscs
@@ -14,8 +19,8 @@
/var/lib/video.00. (These changes will only be asked when you
selected yes in the debconf-question to create the video-directory!)
- -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Thu, 30 Dec 2004 21:56:38 +0100
-
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Fri, 14 Jan 2005 12:17:51 +0100
+
vdr (1.2.6-4) unstable; urgency=low
This is the first release from the VDR and DVB Packaging Team
Index: config-loader.sh
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/config-loader.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config-loader.sh 5 Jan 2005 20:56:10 -0000 1.4
+++ config-loader.sh 14 Jan 2005 11:25:43 -0000 1.5
@@ -26,7 +26,7 @@
REC_CMD=/usr/lib/vdr/vdr-recordingaction
# Commmand executed by vdr to shutdown the system
-SHUTDOWN_CMD="/etc/init.d/vdr stop ; sleep 1 ; /sbin/shutdown -h now"
+SHUTDOWNCMD="/etc/init.d/vdr stop ; sleep 1 ; /sbin/shutdown -h now"
# EPG data file
EPG_FILE=/var/cache/vdr/epg.data
@@ -39,5 +39,8 @@
# Enable / Disable vdr daemon
ENABLED=0
+
+# Enable / Disable automatic shutdown
+ENABLE_SHUTDOWN=0
test -f /etc/default/vdr && . /etc/default/vdr
Index: vdr.init
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.init,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- vdr.init 9 Jan 2005 21:37:39 -0000 1.35
+++ vdr.init 14 Jan 2005 11:25:43 -0000 1.36
@@ -8,7 +8,10 @@
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
NAME=vdr
DESC="Linux Video Disk Recorder"
-VDRSHUTDOWN=/usr/lib/vdr/vdr-shutdown.wrapper
+
+if [ $ENABLE_SHUTDOWN = 1 ]; then
+ VDRSHUTDOWN="-s /usr/lib/vdr/vdr-shutdown.wrapper"
+fi
test "$ENABLED" != "0" || exit 0
@@ -25,7 +28,7 @@
mergecommands "reccmds"
start-stop-daemon --start --quiet \
--exec /usr/sbin/runvdr -- -v $VIDEO_DIR -c $CFG_DIR -r $REC_CMD \
- -s $VDRSHUTDOWN -E $EPG_FILE -u $USER -g $GROUP $OPTIONS \
+ $VDRSHUTDOWN -E $EPG_FILE -u $USER -g $GROUP $OPTIONS \
$PLUGINS &
else
echo -n " - seems to be running already"
Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/changelog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- changelog 9 Jan 2005 22:00:52 -0000 1.73
+++ changelog 14 Jan 2005 11:25:42 -0000 1.74
@@ -1,4 +1,4 @@
-vdr (1.2.6-6) unstable; urgency=low
+vdr (1.2.6-6) unstable; urgency=medium
!!! unreleased - remove this line, when releasing this revision !!!
@@ -9,8 +9,8 @@
* Tobias Grimm <tg@e-tobi.net>
- fixed small bug in vdr-recordingaction
- moved PLUGIN_DIR, PLUGIN_PREFIX, CFG_DIR, PLUGIN_CFG_DIR,
- PLUGIN_ORDER_FILE, CMDHOOKSDIR, REC_CMD and SHUTDOWN_CMD from the
- default file to the init script
+ PLUGIN_ORDER_FILE, CMDHOOKSDIR, REC_CMD from the 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
@@ -30,6 +30,8 @@
- Added vdr-shutdown.wrapper with owner/group root:vdr and mode 6750,
which calls the normal vdr-shutdown-script so that the user vdr is
able to run vdr's shutdown-hooks
+ - The automatic shutdown is now disabled by default, to enable it
+ again you have to change ENABLE_SHUTDOWN=0 to 1 in /etc/default/vdr.
- Changed package vdr to Architecture: any, because it now contains
a binary file
- Added patch from Ludwig Nussel to be able to syncronize the system-
@@ -67,7 +69,7 @@
devices, they will now be created without any question when they
are not existing allready
- -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Sun, 09 Jan 2005 15:41:20 +0100
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Fri, 14 Jan 2005 12:20:27 +0100
vdr (1.2.6-5) unstable; urgency=low
Index: vdr.default
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.default,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- vdr.default 5 Jan 2005 20:56:10 -0000 1.17
+++ vdr.default 14 Jan 2005 11:25:43 -0000 1.18
@@ -6,6 +6,10 @@
# Change to 1 to enable vdr's init-script
ENABLED=0
+# Change this to 1 if you want vdr to be able to shutdown the
+# computer
+ENABLE_SHUTDOWN=0
+
# Video-Directory
VIDEO_DIR="/var/lib/video.00"
@@ -22,4 +26,4 @@
# 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.
-SHUTDOWN_CMD="/etc/init.d/vdr stop ; sleep 1 ; /sbin/shutdown -h now"
+SHUTDOWNCMD="/etc/init.d/vdr stop ; sleep 1 ; /sbin/shutdown -h now"
Index: vdr-shutdown
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr-shutdown,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- vdr-shutdown 5 Jan 2005 20:56:10 -0000 1.9
+++ vdr-shutdown 14 Jan 2005 11:25:43 -0000 1.10
@@ -51,4 +51,4 @@
fi
done
-eval $SHUTDOWN_CMD
+eval $SHUTDOWNCMD