X-Git-Url: https://git.ralfj.de/osspd.git/blobdiff_plain/07dac431365aeba9b5f01b14db0bdedbd3e2abd1..4320d28b2e87c43d88d52e685551bcc9bd07c9a0:/debian/osspd.init?ds=inline

diff --git a/debian/osspd.init b/debian/osspd.init
index 7981c48..8669c76 100644
--- a/debian/osspd.init
+++ b/debian/osspd.init
@@ -14,9 +14,10 @@
 # Author: Ralf Jung <post@ralfj.de>
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC=" OSS Proxy Daemon"
+DESC="OSS Proxy Daemon"
 NAME=osspd
 DAEMON=/usr/sbin/$NAME
+DAEMON_ARGS="--dsp-slave=/usr/lib/osspd/ossp-slave"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
@@ -24,8 +25,6 @@ SCRIPTNAME=/etc/init.d/$NAME
 [ -x "$DAEMON" ] || exit 0
 
 # Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
 . /lib/lsb/init-functions
 
 #
@@ -33,14 +32,15 @@ SCRIPTNAME=/etc/init.d/$NAME
 #
 do_start()
 {
-	modprobe cuse # make sure the cuse module is loaded
 	# Return
 	#   0 if daemon has been started
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+	start-stop-daemon --start --background --quiet --pidfile $PIDFILE --make-pidfile --exec $DAEMON --test > /dev/null \
 		|| return 1
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+	# -f: run in foreground, start-stop-daemon does the forking - this is required to let start-stop-daemon handle the pidfile
+	start-stop-daemon --start --background --quiet --pidfile $PIDFILE --make-pidfile --exec $DAEMON -- -f \
+		$DAEMON_ARGS \
 		|| return 2
 }