- added {waitname:+--name $waitname} to ssd, otherwise there's

  no way to start qpopperd and qpoppersd both at the same time
	/usr/sbin/qpoppersd already running.
- use long options names

svn-id: @10127

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index e4542289f38d754e8b0680278d8b47f0eaa018bb..2d38bd20120258ddf59e698fbb9b7af16b5b7897 100644 (file)
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -612,10 +612,11 @@ daemon() {
                        /sbin/start-stop-daemon -q --start \
                                --nicelevel $nice \
                                ${pidfile:+--pidfile $pidfile} \
-                               ${user:+-c $user} \
+                               ${makepid:+--make-pidfile} \
+                               ${user:+--chiud $user} \
                                ${chdir:+--chdir "$chdir"} \
-                               ${fork:+-b} \
-                               ${makepid:+-m} \
+                               ${fork:+--background} \
+                               ${waitname:+--name $waitname} \
                                --exec "$prog" \
                                -- ${1:+"$@"}
                else