Changeset 29178


Ignore:
Timestamp:
2011-11-16T10:44:23+01:00 (6 years ago)
Author:
nico
Message:

packages/miniupnpd: use new service functions

Location:
packages/net/miniupnpd
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/net/miniupnpd/Makefile

    r28183 r29178  
    1111PKG_NAME:=miniupnpd 
    1212PKG_VERSION:=1.6.20110730 
    13 PKG_RELEASE:=1 
    14 PKG_MD5SUM:=8bd5c0447b6dc1101b96e958ee67d3ea 
     13PKG_RELEASE:=2 
    1514 
    1615PKG_SOURCE_URL:=http://miniupnp.free.fr/files 
    1716PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     17PKG_MD5SUM:=8bd5c0447b6dc1101b96e958ee67d3ea 
    1818 
    1919include $(INCLUDE_DIR)/package.mk 
     
    4545 
    4646define Package/miniupnpd/install 
    47         $(INSTALL_DIR) $(1)/usr/bin $(1)/etc/init.d $(1)/etc/config $(1)/etc/hotplug.d/iface $(1)/etc/hotplug.d/firewall 
    48         $(INSTALL_BIN) $(PKG_BUILD_DIR)/miniupnpd $(1)/usr/bin/miniupnpd 
     47        $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/config $(1)/etc/hotplug.d/iface $(1)/etc/hotplug.d/firewall 
     48        $(INSTALL_BIN) $(PKG_BUILD_DIR)/miniupnpd $(1)/usr/sbin/miniupnpd 
    4949        $(INSTALL_BIN) ./files/miniupnpd.init $(1)/etc/init.d/miniupnpd 
    5050        $(INSTALL_CONF) ./files/upnpd.config $(1)/etc/config/upnpd 
  • packages/net/miniupnpd/files/miniupnpd.init

    r27151 r29178  
    11#!/bin/sh /etc/rc.common 
     2# Copyright (C) 2006-2011 OpenWrt.org 
     3 
    24START=95 
     5 
     6SERVICE_USE_PID=1 
    37 
    48upnpd_get_port_range() { 
     
    167171 
    168172                if [ "$logging" = "1" ]; then 
    169                         start-stop-daemon -b -S -x miniupnpd -- $args -d 
     173                        SERVICE_DAEMONIZE=1 \ 
     174                        service_start /usr/sbin/miniupnpd $args -d 
    170175                else 
    171                         start-stop-daemon -S -x miniupnpd -- $args 
     176                        SERVICE_DAEMONIZE= \ 
     177                        service_start /usr/sbin/miniupnpd $args 
    172178                fi 
    173179        else 
     
    177183 
    178184stop() { 
    179         start-stop-daemon -K -q -x miniupnpd -p /var/run/miniupnpd.pid 
    180         rm -f /var/run/miniupnpd.pid 
     185        service_stop /usr/sbin/miniupnpd 
    181186 
    182187        type miniupnpd_remove_rules >/dev/null 2>/dev/null || \ 
Note: See TracChangeset for help on using the changeset viewer.