From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Wed, 11 Jun 2008 14:58:17 +0000 (+0000)
Subject: lighttpd: fix init script (restart did not work)
X-Git-Tag: Release-2010-05/1~6771
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebcfc2917b588f690f45d40a0dae97ab5bb2543c;p=openembedded.git

lighttpd: fix init script (restart did not work)
---

diff --git a/packages/lighttpd/lighttpd/lighttpd b/packages/lighttpd/lighttpd/lighttpd
index 572381499a..bf89a60b7d 100644
--- a/packages/lighttpd/lighttpd/lighttpd
+++ b/packages/lighttpd/lighttpd/lighttpd
@@ -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."
 	;;
   *)
diff --git a/packages/lighttpd/lighttpd_1.4.18.bb b/packages/lighttpd/lighttpd_1.4.18.bb
index a83efcaf40..4a27c626e4 100644
--- a/packages/lighttpd/lighttpd_1.4.18.bb
+++ b/packages/lighttpd/lighttpd_1.4.18.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Web server"
 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 \