[oe-commits] org.oe.dev lighttpd: fix init script (restart did not work)

[jeremy_laine commit]

lighttpd: fix init script (restart did not work)

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: 99ed4d92c897fb19999e63a3d7eb3b5fae762ff3
ViewMTN: http://monotone.openembedded.org/revision/info/99ed4d92c897fb19999e63a3d7eb3b5fae762ff3
Files:
1
packages/lighttpd/lighttpd/lighttpd
packages/lighttpd/lighttpd_1.4.18.bb
Diffs:

#
# mt diff -rdfd9063622059a3dbbb073272b608d3112d85fde -r99ed4d92c897fb19999e63a3d7eb3b5fae762ff3
#
#
#
# patch "packages/lighttpd/lighttpd/lighttpd"
#  from [ed9e3cde9e3adcba2416e92aeda833fd0ea52a92]
#    to [bbac6389b51a271519deaf171d00386c6fa9925d]
# 
# patch "packages/lighttpd/lighttpd_1.4.18.bb"
#  from [8a644dc2f8ecc2188c7f8a1eb1604e32bfad9315]
#    to [632e100a9bf487c1c13ab8a725b547925ad9d3b4]
#
============================================================
--- packages/lighttpd/lighttpd/lighttpd	ed9e3cde9e3adcba2416e92aeda833fd0ea52a92
+++ packages/lighttpd/lighttpd/lighttpd	bbac6389b51a271519deaf171d00386c6fa9925d
@@ -1,16 +1,15 @@
 #!/bin/sh
-#
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/lighttpd
 NAME=lighttpd
 DESC="Lighttpd Web Server"
+OPTS="-f /etc/lighttpd.conf"
 
-
 case "$1" in
   start)
 	echo -n "Starting $DESC: "
-	start-stop-daemon --start -x "$DAEMON" --  -f /etc/lighttpd.conf
+	start-stop-daemon --start -x "$DAEMON" -- $OPTS
 	echo "$NAME."
 	;;
   stop)
@@ -20,9 +19,9 @@ case "$1" in
 	;;
   restart|force-reload)
 	echo -n "Restarting $DESC: "
-	start-stop-daemon -K -x "$DAEMON"
+	start-stop-daemon --stop -x "$DAEMON"
 	sleep 1
-	start-stop-daemon -S -x "$DAEMON"
+	start-stop-daemon --start -x "$DAEMON" -- $OPTS
 	echo "$NAME."
 	;;
   *)
============================================================
--- packages/lighttpd/lighttpd_1.4.18.bb	8a644dc2f8ecc2188c7f8a1eb1604e32bfad9315
+++ packages/lighttpd/lighttpd_1.4.18.bb	632e100a9bf487c1c13ab8a725b547925ad9d3b4
@@ -2,7 +2,7 @@ DEPENDS = "libpcre"
 SECTION = "net"
 LICENSE = "BSD"
 DEPENDS = "libpcre"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.lighttpd.net/download/lighttpd-${PV}.tar.gz \
 	   file://configure.in.patch;patch=1 \