diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-07 22:59:06 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-07 22:59:06 +0000 |
| commit | ad906c1492c60e897c59a50c28fd9809092a7350 (patch) | |
| tree | 09e23b3d6b68ad1b8ee2ac4467a9f340dfbfbf7d | |
| parent | 8635717aeb007fa80afec46ee1addfe1249c422d (diff) | |
package/uhttpd: use new service wrapper
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28841 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/uhttpd/Makefile | 2 | ||||
| -rwxr-xr-x | package/uhttpd/files/uhttpd.init | 18 |
2 files changed, 9 insertions, 11 deletions
diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile index 6285eab9a..d8bd33c07 100644 --- a/package/uhttpd/Makefile +++ b/package/uhttpd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uhttpd -PKG_RELEASE:=28 +PKG_RELEASE:=29 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_CONFIG_DEPENDS := \ diff --git a/package/uhttpd/files/uhttpd.init b/package/uhttpd/files/uhttpd.init index 1ec009663..c370f9010 100755 --- a/package/uhttpd/files/uhttpd.init +++ b/package/uhttpd/files/uhttpd.init @@ -2,10 +2,13 @@ # Copyright (C) 2010 Jo-Philipp Wich START=50 + +SERVICE_DAEMONIZE=1 +SERVICE_WRITE_PID=1 + UHTTPD_BIN="/usr/sbin/uhttpd" PX5G_BIN="/usr/sbin/px5g" - append_arg() { local cfg="$1" local var="$2" @@ -103,21 +106,16 @@ start_instance() } } - start-stop-daemon -S -x $UHTTPD_BIN \ - -p /var/run/uhttpd_${cfg}.pid \ - -m -b -- -f $UHTTPD_ARGS + SERVICE_PID_FILE=/var/run/uhttpd_${cfg}.pid + service_start $UHTTPD_BIN -f $UHTTPD_ARGS } stop_instance() { local cfg="$1" - [ -f /var/run/uhttpd_${cfg}.pid ] && { - start-stop-daemon -K -q -n ${UHTTPD_BIN##*/} \ - -p /var/run/uhttpd_${cfg}.pid -s TERM - - rm -f /var/run/uhttpd_${cfg}.pid - } + SERVICE_PID_FILE=/var/run/uhttpd_${cfg}.pid + service_stop $UHTTPD_BIN } start() { |