vdr/vdr/debian changelog plugin-loader.sh runvdr vdr.NEWS vdr.postinst

Thomas Schmidt pkg-vdr-dvb-changes@lists.alioth.debian.org
Thu, 30 Dec 2004 21:10:30 +0000


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

Modified Files:
	changelog plugin-loader.sh runvdr vdr.NEWS vdr.postinst 
Log Message:


Index: vdr.NEWS
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.NEWS,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vdr.NEWS	14 Nov 2004 14:04:43 -0000	1.4
+++ vdr.NEWS	30 Dec 2004 21:10:28 -0000	1.5
@@ -1,15 +1,20 @@
 vdr (1.2.6-6) unstable; urgency=low
 
-  In this release we changed the default VIDEO_DIR from /var/lib/video 
-  to /var/lib/video.00, to make adding extra harddiscs for vdr very 
-  easy by just creating /var/lib/video.0{1,2,3,...} and mounting the 
-  drive(s) there. In existing installations we will simply create a 
-  symlink /var/lib/video.00 which points to /var/lib/video. In new 
-  installations /var/lib/video will be a symlink which points to 
-  /var/lib/video.00. (These changes will only be made when you 
+  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.
+  
+  In this release we also changed the default VIDEO_DIR from 
+  /var/lib/video to /var/lib/video.00, to make adding extra harddiscs 
+  for vdr very easy by just creating /var/lib/video.0{1,2,3,...} and 
+  mounting the drive(s) there. In existing installations we will simply 
+  create a symlink /var/lib/video.00 which points to /var/lib/video. In 
+  new installations /var/lib/video will be a symlink which points to 
+  /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>  Sun, 14 Nov 2004 14:50:30 +0100
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Thu, 30 Dec 2004 21:56:38 +0100
  
 vdr (1.2.6-4) unstable; urgency=low
 

Index: plugin-loader.sh
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/plugin-loader.sh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- plugin-loader.sh	10 Nov 2004 21:56:29 -0000	1.22
+++ plugin-loader.sh	30 Dec 2004 21:10:28 -0000	1.23
@@ -47,7 +47,7 @@
 
         # move not startable plugins to $leftout2
         for (( i=${#installed_plugins[@]}, i-- ; i >= 0 ; i-- )); do
-            if ! /usr/bin/vdr -V -L $PLUGIN_DIR -P ${installed_plugins[$i]} \
+            if ! su vdr -c /usr/bin/vdr -V -L $PLUGIN_DIR -P ${installed_plugins[$i]} \
                 2>/dev/null | grep -q "^${installed_plugins[$i]} "; then
                 leftout2="${leftout2} ${installed_plugins[$i]}"
                 unset installed_plugins[$i]

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/changelog,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- changelog	28 Dec 2004 13:31:49 -0000	1.65
+++ changelog	30 Dec 2004 21:10:27 -0000	1.66
@@ -21,8 +21,14 @@
     - When processing the shutdown hooks, no further hook scripts will be
       processed, if one script requests to delay the shutdown.
   * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+    - Do not run as user root anymore, the user vdr will be created
+      and the video-directory and config-files will be changed, so the
+      owner/group is vdr:vdr (closes: #287899)
     - Added german (de.po) debconf-translation from Jens Nachtigall 
       <nachtigall@web.de> (closes: #273643)
+    - Added a note to the package description and README.Debian that vdr
+      (without special plugins) requires a DVB-Card with an mpeg-decoder
+      (Closes: #287428)
     - Improved runvdr-script: when no loaded dvb-modules were found, 
       try to load the module dvb (could be an alias for the real 
       dvb-module)
@@ -44,12 +50,9 @@
       not exist, /var/lib/video will be a symlink to /var/lib/video.00)
     - Removed unnecessary debconf-question about creating the dvb 
       devices, they will now be created without any question when they
-      are not existing
-    - Added a note to the package description and README.Debian that vdr
-      (without special plugins) requires a DVB-Card with an mpeg-decoder
-      (Closes: #287428)
+      are not existing allready
 
- -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Tue, 28 Dec 2004 14:26:42 +0100
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Thu, 30 Dec 2004 22:00:44 +0100
 
 vdr (1.2.6-5) unstable; urgency=low
 

Index: runvdr
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/runvdr,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- runvdr	17 Oct 2004 10:42:35 -0000	1.6
+++ runvdr	30 Dec 2004 21:10:28 -0000	1.7
@@ -3,7 +3,7 @@
 #
 
 OPTIONS="$*"
-VDRCMD="LD_ASSUME_KERNEL=2.4 /usr/bin/vdr $OPTIONS"
+VDRCMD="su vdr -c LD_ASSUME_KERNEL=2.4 /usr/bin/vdr $OPTIONS"
 
 function get_modulenames ()
 {
@@ -17,10 +17,10 @@
 
 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
+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"
 

Index: vdr.postinst
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.postinst,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- vdr.postinst	14 Nov 2004 10:45:35 -0000	1.11
+++ vdr.postinst	30 Dec 2004 21:10:28 -0000	1.12
@@ -94,6 +94,18 @@
 	   		ln -s video.00 /var/lib/video
 		fi
 	fi
+
+	# ensure that user and group 'vdr' exist
+	adduser --system --home /var/lib/video --shell /bin/false --no-create-home \
+		--disabled-login --group vdr
+
+	# put vdr in group video so that it can access the DVB device nodes
+	adduser vdr video
+
+	# ensure that vdr's config and recording files are correctly owned
+	[ ! -e /var/lib/video ] || chown -R vdr:vdr /var/lib/video/
+	[ ! -e /var/lib/vdr ] || chown vdr:vdr /var/lib/vdr/*
+	[ ! -e /var/cache/vdr ] || chown vdr:vdr /var/cache/vdr/*
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)