vdr/vdr/debian config-loader.sh vdr-shutdown vdr.init

[Tobias Grimm]

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

Modified Files:
	config-loader.sh vdr-shutdown vdr.init 
Log Message:
fixed shutdown command handling

Index: vdr-shutdown
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr-shutdown,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- vdr-shutdown	27 Nov 2004 20:53:38 -0000	1.7
+++ vdr-shutdown	5 Jan 2005 20:48:05 -0000	1.8
@@ -6,10 +6,7 @@
 # see README.Debian
 #
 
-test -f /etc/default/vdr && . /etc/default/vdr
-
-[ -z "$SHUTDOWNCMD" ] && \
-  export SHUTDOWNCMD="/etc/init.d/vdr stop ; sleep 1 ; /sbin/shutdown -h now"
+. /usr/lib/vdr/config-loader.sh
 
 SHUTDOWN_HOOKS_DIR=/usr/share/vdr/shutdown-hooks/
 

Index: config-loader.sh
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/config-loader.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config-loader.sh	5 Jan 2005 20:36:20 -0000	1.2
+++ config-loader.sh	5 Jan 2005 20:48:05 -0000	1.3
@@ -26,7 +26,7 @@
 REC_CMD=/usr/lib/vdr/vdr-recordingaction
 
 # Commmand executed by vdr to shutdown the system
-SHUTDOWN_CMD=/usr/lib/vdr/vdr-shutdown
+SHUTDOWNCMD="/etc/init.d/vdr stop ; sleep 1 ; /sbin/shutdown -h now"
 
 # EPG data file
 EPG_FILE=/var/cache/vdr/epg.data
@@ -38,7 +38,6 @@
 GROUP=vdr
 
 # Enable / Disable vdr daemon
-
 ENABLED=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.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- vdr.init	2 Jan 2005 17:58:43 -0000	1.31
+++ vdr.init	5 Jan 2005 20:48:05 -0000	1.32
@@ -6,6 +6,7 @@
 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
 
 . /usr/lib/vdr/config-loader.sh
 
@@ -25,7 +26,7 @@
     	mergecommands "reccmds"
     	start-stop-daemon --start --quiet \
 	 	--exec /usr/sbin/runvdr -- -v $VIDEO_DIR -c $CFG_DIR -r $REC_CMD \
-	 	-s $SHUTDOWN_CMD -E $EPG_FILE -u $USER -g $GROUP $OPTIONS \
+	 	-s $VDRSHUTDOWN -E $EPG_FILE -u $USER -g $GROUP $OPTIONS \
 		$PLUGINS &
     else
 	   echo -n " - seems to be running already"