KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

package/uhttpd: use new service wrapper

Browse source 
SVN-Revision: 28841
This commit is contained in:
Nicolas Thill 2011-11-07 22:59:06 +00:00
parent d7409c85b5
commit 75e186832a
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/uhttpd/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd PKG_NAME:=uhttpd
PKG_RELEASE:=28 PKG_RELEASE:=29
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_CONFIG_DEPENDS := \ PKG_CONFIG_DEPENDS := \

18
package/uhttpd/files/uhttpd.init
View file

@ -2,10 +2,13 @@
# Copyright (C) 2010 Jo-Philipp Wich # Copyright (C) 2010 Jo-Philipp Wich
START=50 START=50
SERVICE_DAEMONIZE=1
SERVICE_WRITE_PID=1
UHTTPD_BIN="/usr/sbin/uhttpd" UHTTPD_BIN="/usr/sbin/uhttpd"
PX5G_BIN="/usr/sbin/px5g" PX5G_BIN="/usr/sbin/px5g"
append_arg() { append_arg() {
local cfg="$1" local cfg="$1"
local var="$2" local var="$2"
@ -103,21 +106,16 @@ start_instance()
} }
} }
start-stop-daemon -S -x $UHTTPD_BIN \ SERVICE_PID_FILE=/var/run/uhttpd_${cfg}.pid
-p /var/run/uhttpd_${cfg}.pid \ service_start $UHTTPD_BIN -f $UHTTPD_ARGS
-m -b -- -f $UHTTPD_ARGS
} }
stop_instance() stop_instance()
{ {
local cfg="$1" local cfg="$1"
[ -f /var/run/uhttpd_${cfg}.pid ] && { SERVICE_PID_FILE=/var/run/uhttpd_${cfg}.pid
start-stop-daemon -K -q -n ${UHTTPD_BIN##*/} \ service_stop $UHTTPD_BIN
-p /var/run/uhttpd_${cfg}.pid -s TERM
rm -f /var/run/uhttpd_${cfg}.pid
}
} }
start() { start() {