bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

packages/miniupnpd: use new service functions

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@29178 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2011-11-16 09:44:23 +00:00
parent 9e91f230fd
commit 644ad3eee0
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/miniupnpd/Makefile
View File

@ -10,11 +10,11 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=miniupnpd
PKG_VERSION:=1.6.20110730
PKG_RELEASE:=1
PKG_MD5SUM:=8bd5c0447b6dc1101b96e958ee67d3ea
PKG_RELEASE:=2
PKG_SOURCE_URL:=http://miniupnp.free.fr/files
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_MD5SUM:=8bd5c0447b6dc1101b96e958ee67d3ea
include $(INCLUDE_DIR)/package.mk
@ -44,8 +44,8 @@ define Build/Compile
endef
define Package/miniupnpd/install
$(INSTALL_DIR) $(1)/usr/bin $(1)/etc/init.d $(1)/etc/config $(1)/etc/hotplug.d/iface $(1)/etc/hotplug.d/firewall
$(INSTALL_BIN) $(PKG_BUILD_DIR)/miniupnpd $(1)/usr/bin/miniupnpd
$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/config $(1)/etc/hotplug.d/iface $(1)/etc/hotplug.d/firewall
$(INSTALL_BIN) $(PKG_BUILD_DIR)/miniupnpd $(1)/usr/sbin/miniupnpd
$(INSTALL_BIN) ./files/miniupnpd.init $(1)/etc/init.d/miniupnpd
$(INSTALL_CONF) ./files/upnpd.config $(1)/etc/config/upnpd
$(INSTALL_DATA) ./files/miniupnpd.iface.hotplug $(1)/etc/hotplug.d/iface/50-miniupnpd

13
net/miniupnpd/files/miniupnpd.init
View File

@ -1,6 +1,10 @@
#!/bin/sh /etc/rc.common
# Copyright (C) 2006-2011 OpenWrt.org
START=95
SERVICE_USE_PID=1
upnpd_get_port_range() {
local _var="$1"; shift
local _val
@ -166,9 +170,11 @@ start() {
miniupnpd_add_rules "$zone" "${extiface:-wan}" "$ifname"
if [ "$logging" = "1" ]; then
start-stop-daemon -b -S -x miniupnpd -- $args -d
SERVICE_DAEMONIZE=1 \
service_start /usr/sbin/miniupnpd $args -d
else
start-stop-daemon -S -x miniupnpd -- $args
SERVICE_DAEMONIZE= \
service_start /usr/sbin/miniupnpd $args
fi
else
logger -t "upnp daemon" "external interface not found, not starting"
@ -176,8 +182,7 @@ start() {
}
stop() {
start-stop-daemon -K -q -x miniupnpd -p /var/run/miniupnpd.pid
rm -f /var/run/miniupnpd.pid
service_stop /usr/sbin/miniupnpd
type miniupnpd_remove_rules >/dev/null 2>/dev/null || \
ACTION=- . /etc/hotplug.d/firewall/50-miniupnpd