From 1d8f9852338e7e8c83f857bc0cd6a3cc1514756b Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Sat, 10 Nov 2012 10:43:28 +0100
Subject: main/tvheadend: fix initd

---
 main/tvheadend/tvheadend.initd | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'main/tvheadend/tvheadend.initd')

diff --git a/main/tvheadend/tvheadend.initd b/main/tvheadend/tvheadend.initd
index c244dd63f..9b56313a8 100644
--- a/main/tvheadend/tvheadend.initd
+++ b/main/tvheadend/tvheadend.initd
@@ -1,19 +1,23 @@
 #!/sbin/runscript
+
 depend() {
         need net
 }
 
 start() {
-        ebegin "Starting tvheadend" 
+        ebegin "Starting tvheadend"
         start-stop-daemon --start \
-                --user ${TVHUSER} \
-                --exec ${TVHBIN} -- -C -f -c \
-		${TVHCONF}
+                --exec ${TVHBIN} -- \
+                -C -f -u ${TVHUSER} \
+                -c ${TVHCONF}
         eend $?
 }
 
 stop() {
-        ebegin "Stopping tvheadend" 
-        start-stop-daemon --stop --quiet --name tvheadend --signal 2
+        ebegin "Stopping tvheadend"
+        start-stop-daemon --stop --quiet \
+                --retry TERM/30/KILL/5 \
+                --pidfile /var/run/tvheadend.pid
         eend $?
 }
+
-- 
cgit v1.2.3