r345 - vdr/vdr-xxv/trunk/debian

[Tobias Grimm]

Author: tiber-guest
Date: 2005-03-28 16:38:32 +0000 (Mon, 28 Mar 2005)
New Revision: 345

Modified:
   vdr/vdr-xxv/trunk/debian/init
Log:
xxv: neede to remove xxvd.pid manually

Modified: vdr/vdr-xxv/trunk/debian/init
===================================================================
--- vdr/vdr-xxv/trunk/debian/init	2005-03-28 14:58:54 UTC (rev 344)
+++ vdr/vdr-xxv/trunk/debian/init	2005-03-28 16:38:32 UTC (rev 345)
@@ -53,21 +53,18 @@
 #
 # Create temp dir owned by xxv
 #
-create_temp() 
+create_grabdir() 
 {
-	TEMPDIR=`mktemp -d -p /tmp vdr-xxv-XXXXXX`
+	XXV_GRABDIR=`mktemp -d -p /tmp vdr-xxv-XXXXXX`
 	
-   	# Check if the group:user vdr:xxv exist and make 
-	# the temporary directory owned by vdr:xxv
-	if getent group | grep -q "^vdr:" ; then
-  	   chgrp vdr $TEMPDIR
-        fi
 	if getent group | grep -q "^xxv:" ; then
-  	   chown xxv $TEMPDIR
+  	   chgrp xxv $XXV_GRABDIR
         fi
-	
-        # group vdr as well as owner xxv may write to this directory
-	chmod a=,g=rwx,o=rwx $TEMPDIR
+	if getent passwd | grep -q "^vdr:" ; then
+  	   chown vdr $XXV_GRABDIR
+        fi
+
+	chmod a=,g=srwx,o=rwx $XXV_GRABDIR
 }
 
 
@@ -80,7 +77,7 @@
     create_temp
     touch $PIDFILE
     chown xxv $PIDFILE
-    TEMPDIR=$TEMPDIR start-stop-daemon --start --pidfile $PIDFILE \
+    XXV_GRABDIR=$XXV_GRABDIR start-stop-daemon --start --pidfile $PIDFILE \
       --nicelevel 19 -c $USER:$GROUP --exec $DAEMON -- $COMMANDLINE
 }
 
@@ -91,6 +88,7 @@
 stop()
 {
     start-stop-daemon --stop -q -o --pidfile $PIDFILE
+    rm -f $PIDFILE
 }