From b6920cd2d81b2dab91136da963da2dc186f493a7 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 4 Feb 2006 15:26:13 +0100
Subject: [PATCH] The 'runvdr' script no longer uses the $VDRUSR environment
 variable

---
 HISTORY |  3 +++
 INSTALL |  3 ++-
 runvdr  | 11 ++++-------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/HISTORY b/HISTORY
index 19e2793c..d11f2c74 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4300,3 +4300,6 @@ Video Disk Recorder Revision History
 - cDevice::Transferring() can now be used to determine whether the (primary)
   device is currently playing in Transfer Mode (based on a suggestion by
   Reinhard Nissl).
+- The 'runvdr' script no longer uses the $VDRUSR environment variable to set
+  the user id under which 'vdr' shall run. Just add the '-u username' option
+  when you call 'runvdr'.
diff --git a/INSTALL b/INSTALL
index 3be9c34e..c4b2a59e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -136,7 +136,8 @@ watchdog timer to restart the program in case something happens that
 causes a program hangup. If you change the command line options for the
 call to the VDR program, be sure to NOT use the '-d' option! Otherwise
 VDR will go into 'deamon' mode and the initial program call will return
-immediately!
+immediately! 'runvdr' needs to be started as user 'root'. Use the '-u'
+option to run the actual 'vdr' program under a different user id.
 
 Setting the system time:
 ------------------------
diff --git a/runvdr b/runvdr
index 7fd4d819..355549cb 100755
--- a/runvdr
+++ b/runvdr
@@ -5,12 +5,9 @@
 # If VDR exits abnormally, the driver will be reloaded
 # and VDR restarted.
 #
-# Set the environment variable VDRUSR to the user id you
-# want VDR to run with. If VDRUSR is not set, VDR will run
-# as user 'vdr'.
-#
 # Since this script loads the DVB driver, it must be started
-# as user 'root'.
+# as user 'root'. Add the option "-u username" to run VDR
+# under the given user name.
 #
 # Any command line parameters will be passed on to the
 # actual 'vdr' program.
@@ -18,11 +15,11 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: runvdr 1.15 2005/12/31 13:30:11 kls Exp $
+# $Id: runvdr 1.16 2006/02/04 15:20:48 kls Exp $
 
 DVBDIR="../DVB/driver"
 VDRPRG="./vdr"
-VDRCMD="$VDRPRG -u $VDRUSR -w 60 $*"
+VDRCMD="$VDRPRG -w 60 $*"
 
 LSMOD="`/sbin/lsmod | grep -w '^dvb' | wc -l`"
 KILL="/usr/bin/killall -q -TERM"