Changeset 30265


Ignore:
Timestamp:
2012-02-05T17:14:40+01:00 (5 years ago)
Author:
jow
Message:

[packages_10.03.2] stun: merge r29095, r29199

Location:
branches/packages_10.03.2/net/stun
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/net/stun/Makefile

    r27141 r30265  
    1010PKG_NAME:=stund 
    1111PKG_VERSION:=0.96 
    12 PKG_RELEASE:=3 
     12PKG_RELEASE:=5 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_Aug13.tgz 
     
    7474endef 
    7575 
     76define Package/stund/conffiles 
     77/etc/config/stund 
     78endef 
     79 
    7680define Package/stun-client/install 
    7781        $(INSTALL_DIR) $(1)/usr/sbin 
  • branches/packages_10.03.2/net/stun/files/stund.init

    r27141 r30265  
    44START=70 
    55 
     6SERVICE_DAEMONIZE=1 
     7SERVICE_WRITE_PID=1 
     8 
    69start() { 
    710        local pri_ip sec_ip pri_port sec_port 
     11 
    812        parse_opts() { 
    913                local cfg="$1" 
    10                 config_get pri_ip   "$cfg" primaryip 
    11                 config_get sec_ip   "$cfg" secondaryip 
    12                 config_get pri_port "$cfg" primaryport 
    13                 config_get sec_port "$cfg" secondaryport 
     14                config_get pri_ip   "$cfg" 'primaryip' 
     15                config_get sec_ip   "$cfg" 'secondaryip' 
     16                config_get pri_port "$cfg" 'primaryport' 
     17                config_get sec_port "$cfg" 'secondaryport' 
    1418        } 
    1519 
    16         config_load "stund" 
     20        config_load 'stund' 
    1721        config_foreach parse_opts 
    1822 
    19         start-stop-daemon -S -p /var/run/stund.pid -m -b \ 
    20                 -x /usr/sbin/stund -- \ 
     23        service_start /usr/sbin/stund \ 
    2124                ${pri_ip:+-h $pri_ip} ${sec_ip:+-a $sec_ip} \ 
    2225                ${pri_port:+-p $pri_port} ${sec_port:+-o $sec_port} 
     
    2427 
    2528stop() { 
    26         service_kill stund /var/run/stund.pid 
    27         rm -f /var/run/stund.pid 
     29        service_stop /usr/sbin/stund 
    2830} 
Note: See TracChangeset for help on using the changeset viewer.