From aa73d1753056b5abb806c0e10f99672c60599c5c Mon Sep 17 00:00:00 2001
From: Hamish Moffatt <hamish@cloud.net.au>
Date: Tue, 18 Mar 2008 00:20:24 +0000
Subject: Don't use long options to start-stop-daemon as they may be disabled
 in the busybox configuration

---
 package/dropbear/dropbear-init.patch   |  4 ++--
 package/l2tp/l2tpd                     |  8 ++++----
 package/lighttpd/rc.lighttpd           |  4 ++--
 package/mdnsresponder/rc.mdnsresponder | 12 ++++++------
 package/netplug/S29netplug             |  4 ++--
 package/sysklogd/S25syslog             |  8 ++++----
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/package/dropbear/dropbear-init.patch b/package/dropbear/dropbear-init.patch
index d6bf1740a..78b280999 100644
--- a/package/dropbear/dropbear-init.patch
+++ b/package/dropbear/dropbear-init.patch
@@ -27,12 +27,12 @@
 +
 +start() {
 + 	echo -n "Starting dropbear sshd: "
-+	start-stop-daemon --start --quiet --pidfile /var/run/dropbear.pid --exec /usr/sbin/dropbear
++	start-stop-daemon -S -q -p /var/run/dropbear.pid --exec /usr/sbin/dropbear
 +	echo "OK"
 +}
 +stop() {
 +	echo -n "Stopping sshd: "
-+	start-stop-daemon --stop --quiet --pidfile /var/run/dropbear.pid
++	start-stop-daemon -K -q -p /var/run/dropbear.pid
 +	echo "OK"
 +}
 +restart() {
diff --git a/package/l2tp/l2tpd b/package/l2tp/l2tpd
index 0b51339f3..8bed72db3 100755
--- a/package/l2tp/l2tpd
+++ b/package/l2tp/l2tpd
@@ -8,15 +8,15 @@ test -f $DAEMON || exit 0
 
 case "$1" in
   start)
-    start-stop-daemon --start  --pidfile $PIDFILE --exec $DAEMON -- -D &
+    start-stop-daemon -S  -p $PIDFILE -x $DAEMON -- -D &
     ;;
   stop)
-    start-stop-daemon --stop  --pidfile $PIDFILE --exec $DAEMON
+    start-stop-daemon -K  -p $PIDFILE -x $DAEMON
     ;;
   restart|force-reload)
-    start-stop-daemon --stop  --pidfile $PIDFILE --exec $DAEMON 
+    start-stop-daemon -K  -p $PIDFILE -x $DAEMON 
     sleep 1
-    start-stop-daemon --start  --pidfile $PIDFILE --exec $DAEMON
+    start-stop-daemon -S  -p $PIDFILE -x $DAEMON
     ;;
   *)
     echo "Usage: /etc/init.d/l2tdp {start|stop|restart|force-reload}"
diff --git a/package/lighttpd/rc.lighttpd b/package/lighttpd/rc.lighttpd
index 837e074e8..f76c38211 100644
--- a/package/lighttpd/rc.lighttpd
+++ b/package/lighttpd/rc.lighttpd
@@ -7,12 +7,12 @@ umask 077
 
 start() {
  	echo -n "Starting lighttpd: "
-	start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/lighttpd.pid -b --exec /usr/sbin/lighttpd -- -f /etc/lighttpd/lighttpd.conf -D
+	start-stop-daemon -S -q -m -p /var/run/lighttpd.pid -b -x /usr/sbin/lighttpd -- -f /etc/lighttpd/lighttpd.conf -D
 	echo "OK"
 }
 stop() {
 	echo -n "Stopping lighttpd: "
-	start-stop-daemon --stop --quiet --pidfile /var/run/lighttpd.pid
+	start-stop-daemon -K -q -p /var/run/lighttpd.pid
 	echo "OK"
 }
 restart() {
diff --git a/package/mdnsresponder/rc.mdnsresponder b/package/mdnsresponder/rc.mdnsresponder
index 1b08cf06e..4b3c31203 100644
--- a/package/mdnsresponder/rc.mdnsresponder
+++ b/package/mdnsresponder/rc.mdnsresponder
@@ -7,8 +7,8 @@ umask 077
 
 start() {
  	echo -n "Starting mdnsd: "
-	start-stop-daemon --start --quiet --pidfile /var/run/mdnsd.pid \
-                --exec /usr/sbin/mdnsd
+	start-stop-daemon -S -q -p /var/run/mdnsd.pid \
+                -x /usr/sbin/mdnsd
 	if [ "$?" != "0" ] ; then
 		echo "FAIL"
 		return 1
@@ -16,8 +16,8 @@ start() {
 	echo "OK"
 
 	echo -n "Starting mDNSResponderPosix: "
-	start-stop-daemon --start --quiet --pidfile /var/run/mDNSResponderPosix.pid \
-                --exec /usr/sbin/mDNSResponderPosix \
+	start-stop-daemon -S -q -p /var/run/mDNSResponderPosix.pid \
+                -x /usr/sbin/mDNSResponderPosix \
                 -- -b -f /etc/mDNSResponderPosix.conf -P /var/run/mDNSResponderPosix.pid
 	if [ "$?" != "0" ] ; then
 		echo "FAIL"
@@ -27,7 +27,7 @@ start() {
 }
 stop() {
 	echo -n "Stopping mDNSResponderPosix: "
-	start-stop-daemon --stop --quiet --pidfile /var/run/mDNSResponderPosix.pid
+	start-stop-daemon -K -q -p /var/run/mDNSResponderPosix.pid
 	if [ "$?" != "0" ] ; then
 		echo "FAIL"
 		return 1
@@ -35,7 +35,7 @@ stop() {
 	echo "OK"
 
 	echo -n "Stopping mdnsd: "
-	start-stop-daemon --stop --quiet --pidfile /var/run/mdnsd.pid
+	start-stop-daemon -K -q -p /var/run/mdnsd.pid
 	if [ "$?" != "0" ] ; then
 		echo "FAIL"
 		return 1
diff --git a/package/netplug/S29netplug b/package/netplug/S29netplug
index 791e14b88..e246674d5 100755
--- a/package/netplug/S29netplug
+++ b/package/netplug/S29netplug
@@ -40,7 +40,7 @@ case "$1" in
   start)
 	# Start daemon.
 	echo -n $"Starting network plug daemon: "
-	start-stop-daemon --start --quiet --pidfile /var/run/netplugd.pid --exec /sbin/netplugd ${NETPLUGDARGS}
+	start-stop-daemon -S -q -p /var/run/netplugd.pid -x /sbin/netplugd ${NETPLUGDARGS}
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/netplugd
@@ -48,7 +48,7 @@ case "$1" in
   stop)
 	# Stop daemon.
 	echo -n $"Shutting down network plug daemon: "
-	start-stop-daemon --stop --name netplugd
+	start-stop-daemon -K -n netplugd
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/netplugd
diff --git a/package/sysklogd/S25syslog b/package/sysklogd/S25syslog
index 07683ed2f..793ac6129 100755
--- a/package/sysklogd/S25syslog
+++ b/package/sysklogd/S25syslog
@@ -9,20 +9,20 @@ umask 077
 
 start() {
  	echo -n "Starting syslogd: "
-	start-stop-daemon --start --quiet --pidfile /var/run/syslog.pid --exec /sbin/syslogd -- -m 0
+	start-stop-daemon -S -q -p /var/run/syslog.pid -x /sbin/syslogd -- -m 0
 	echo "OK"
 
 	echo -n "Starting klogd: "
-	start-stop-daemon --start --quiet --pidfile /var/run/klogd.pid --exec /sbin/klogd
+	start-stop-daemon -S -q -p /var/run/klogd.pid -x /sbin/klogd
 	echo "OK"
 }
 stop() {
 	echo -n "Stopping klogd: "
-	start-stop-daemon --stop --name klogd
+	start-stop-daemon -K -n klogd
 	echo "OK"
 
 	echo -n "Stopping syslogd: "
-	start-stop-daemon --stop --name syslogd
+	start-stop-daemon -K -n syslogd
 	echo "OK"
 }
 restart() {
-- 
cgit v1.2.3