X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdaemon%2Fdata%2Fjenirokd;h=c5edb445c81efb2cee00b2de1f6a2d45d699a9ba;hb=4c87b6256dcaa2fc16568fcdb4d7a83f840cccd1;hp=4be7cdae5238b0438a19c4921c7dfb05b3068e0e;hpb=8d5a300af1292568264137af8a7a32027ffb705a;p=jenirok

diff --git a/src/daemon/data/jenirokd b/src/daemon/data/jenirokd
index 4be7cda..c5edb44 100755
--- a/src/daemon/data/jenirokd
+++ b/src/daemon/data/jenirokd
@@ -2,25 +2,31 @@
 
 NAME=jenirokd
 DAEMON=/usr/bin/jenirokd
+DAEMONUSER=user
+PIDFILE=/tmp/jenirokd.pid
+PARAMS=""
+
+if [ "$2" == "manual" ]; then
+  PARAMS=manual
+fi
 
 export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
 
 case "$1" in
   start)
-        echo -n "Starting daemon: "$NAME
-	start-stop-daemon --start --background --exec $DAEMON
-        echo "."
+        echo "Starting daemon: "$NAME
+	start-stop-daemon --start -c $DAEMONUSER --background --pidfile $PIDFILE --make-pidfile --exec $DAEMON $PARAMS
+	chown $DAEMONUSER $PIDFILE
 	;;
   stop)
-        echo -n "Stopping daemon: "$NAME
-	start-stop-daemon --stop --oknodo --name $NAME
-        echo "."
+        echo "Stopping daemon: "$NAME
+	start-stop-daemon --stop --user $DAEMONUSER --oknodo --pidfile $PIDFILE
 	;;
   restart)
-        echo -n "Restarting daemon: "$NAME
-	start-stop-daemon --stop --quiet --oknodo --retry 30 --name $NAME
-	start-stop-daemon --start --quiet --background --exec $DAEMON
-	echo "."
+        echo "Restarting daemon: "$NAME
+	start-stop-daemon --stop --user $DAEMONUSER --oknodo --pidfile $PIDFILE
+	start-stop-daemon --start -c $DAEMONUSER --background --pidfile $PIDFILE --make-pidfile --exec $DAEMON $PARAMS
+	chown $DAEMONUSER $PIDFILE
 	;;
 
   *)
@@ -29,4 +35,3 @@ case "$1" in
 esac
 
 exit 0
-