Fix up System V initialisation file to start with user and group "shairport-sync...

diff --git a/scripts/shairport-sync.in b/scripts/shairport-sync.in
index 6bcfe9fea4291c967adfd9361f91245f2c10b4a7..e65e51e653d39318ffe0290a71aee098be8d3328 100755 (executable)
--- a/scripts/shairport-sync.in
+++ b/scripts/shairport-sync.in
@@ -23,8 +23,7 @@ DAEMON=@prefix@/bin/$NAME
 # impossible to pass as arguments.
 
 # Instead, we add the arguments directly to the relevant line in the do_start() function below
-
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=/var/run/$NAME/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
 # Exit if the package is not installed
@@ -50,29 +49,16 @@ do_start()
        #   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 -c shairport-sync:shairport-sync --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
                || return 1
 
-# This script is set to start running after all other services have started.
-# However, if you find that Shairport Sync is still being started before what it needs is ready,
-# uncomment the next line to get the script to wait for three seconds before attempting to start Shairport Sync.
-#      sleep 3
+       # This script is set to start running after all other services have started.
+       # However, if you find that Shairport Sync is still being started before what it needs is ready,
+       # uncomment the next line to get the script to wait for three seconds before attempting to start Shairport Sync.
+       # sleep 3
 
-# Uncomment just one of the following start-stop-daemon lines, or comment them all out and add your own.
-# Shairport Sync will read settings from the configuration file (/etc/shairport-sync.conf by default) and will then apply any command line options.
-# In the default script, the first line is uncommented, selecting daemon mode (-d). Settings will be taken from the configuration file.
-# BTW, if you're using software volume control, you may have to use alsamixer or similar to set the output device's volume to its maximum level first
-# BTW2, you can use alsamixer to find device identifiers (e.g. hw:1) and mixer names (e.g. "Speaker"). No need to change ALSA's defaults.
-# BTW3, the argument after -a is simply the name the shairport service will be visible as.
-       start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- -d || return 2
-#      start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- -d -a "Topping TP30 or Griffin iMic on Raspberry Pi" -- -d hw:1 -t hardware -c "PCM" || return 2
-#      start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- -d -a "'3D Sound' USB Soundcard on Raspberry Pi" -- -d hw:1 -t hardware -c "Speaker" || return 2
-# BTW, that "3D Sound" USB soundcard sometimes has the mixer name "Headphone" rather than "Speaker" -- use alsamixer to check.
-#      start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- -d -a "IQaudIO" -- -d hw:1 -t hardware -c "Playback Digital" || return 2
-# BTW, newer versions of IQaudIO have a different mixer name -- use alsamixer to check.
-       # Add code here, if necessary, that waits for the process to be ready
-       # to handle requests from services started subsequently which depend
-       # on this one.  As a last resort, sleep for some time.
+       # Shairport Sync reads settings from the configuration file (/etc/shairport-sync.conf by default) and will then apply any command line options.
+       start-stop-daemon -c shairport-sync:shairport-sync --start --quiet --pidfile $PIDFILE --exec $DAEMON -- -d || return 2
 }
 
 #