From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 7 Nov 2011 22:59:06 +0000 (+0000)
Subject: package/uhttpd: use new service wrapper
X-Git-Tag: reboot~15617
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=75e186832a099b0844c697738e1174a7d882c9f6;p=openwrt%2Fstaging%2Fxback.git

package/uhttpd: use new service wrapper

SVN-Revision: 28841
---

diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index 6285eab9ac..d8bd33c075 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 1ec009663b..c370f90109 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() {