summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Laine <jeremy.laine@m4x.org>2008-06-11 14:58:17 +0000
committerJeremy Laine <jeremy.laine@m4x.org>2008-06-11 14:58:17 +0000
commitebcfc2917b588f690f45d40a0dae97ab5bb2543c (patch)
tree22ea7ad8fe1cf656bb6a1b22ccaa793d8a764152
parent1d633990126e72f44fd06373be4f4f7981500dc9 (diff)
lighttpd: fix init script (restart did not work)
-rw-r--r--packages/lighttpd/lighttpd/lighttpd11
-rw-r--r--packages/lighttpd/lighttpd_1.4.18.bb2
2 files changed, 6 insertions, 7 deletions
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 \