vdr/vdr/debian vdr-shutdown-message vdr.init vdr.install

[Thomas Schmidt]

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

Modified Files:
	vdr.init vdr.install 
Added Files:
	vdr-shutdown-message 
Log Message:
* display a short message on the osd when the user wants to shutdown the system without having $ENABLE_SHUTDOWN set to 1

Index: vdr.install
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.install,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- vdr.install	9 Jan 2005 21:37:39 -0000	1.10
+++ vdr.install	16 Jan 2005 15:25:34 -0000	1.11
@@ -25,6 +25,7 @@
 debian/R90.custom          etc/vdr/recording-hooks/
 
 debian/vdr-shutdown         usr/lib/vdr/
+debian/vdr-shutdown-message usr/lib/vdr/
 debian/vdr-shutdown.wrapper usr/lib/vdr/
 debian/S90.custom           etc/vdr/shutdown-hooks/
 

--- NEW FILE: vdr-shutdown-message ---
#!/bin/sh

/usr/lib/vdr/svdrpsend.pl MESG "Shutdown deactivated, enable it by editing /etc/default/vdr"

exit 1

Index: vdr.init
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.init,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- vdr.init	15 Jan 2005 18:14:18 -0000	1.37
+++ vdr.init	16 Jan 2005 15:25:34 -0000	1.38
@@ -9,7 +9,8 @@
 NAME=vdr
 DESC="Linux Video Disk Recorder"
 
-test "$ENABLE_SHUTDOWN" = "1" && VDRSHUTDOWN="-s /usr/lib/vdr/vdr-shutdown.wrapper"
+test "$ENABLE_SHUTDOWN" = "1" && VDRSHUTDOWN="/usr/lib/vdr/vdr-shutdown.wrapper" \
+	|| VDRSHUTDOWN="/usr/lib/vdr/vdr-shutdown-message"
 
 test "$ENABLED" != "0" || exit 0
 
@@ -26,7 +27,7 @@
     	mergecommands "reccmds"
     	start-stop-daemon --start --quiet \
 	 	--exec /usr/sbin/runvdr -- -v $VIDEO_DIR -c $CFG_DIR -r $REC_CMD \
-	 	$VDRSHUTDOWN -E $EPG_FILE -u $USER -g $GROUP --port $SVDRP_PORT \
+	 	-s $VDRSHUTDOWN -E $EPG_FILE -u $USER -g $GROUP --port $SVDRP_PORT \
 		$OPTIONS $PLUGINS &
     else
 	   echo -n " - seems to be running already"