Changeset 30209


Ignore:
Timestamp:
2012-02-05T16:18:02+01:00 (5 years ago)
Author:
jow
Message:

[packages_10.03.2] iodine: merge r29059, r29199

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

Legend:

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

    r26065 r30209  
    11# 
    2 # Copyright (C) 2006-2010 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010PKG_NAME:=iodine 
    1111PKG_VERSION:=0.6.0-rc1 
    12 PKG_RELEASE:=3 
     12PKG_RELEASE:=5 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     
    6262endef 
    6363 
     64define Package/iodined/conffiles 
     65/etc/config/iodined 
     66endef 
     67 
    6468$(eval $(call BuildPackage,iodine)) 
    6569$(eval $(call BuildPackage,iodined)) 
  • branches/packages_10.03.2/net/iodine/files/iodined.init

    r8784 r30209  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2006 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
     3 
    34START=50 
    45 
    5 start_service () { 
     6start_instance () { 
    67        local section="$1" 
    7         config_get address  "$section" address 
    8         config_get password "$section" password 
    9         config_get tunnelip "$section" tunnelip 
    10         config_get tld      "$section" tld 
     8        config_get address  "$section" 'address' 
     9        config_get password "$section" 'password' 
     10        config_get tunnelip "$section" 'tunnelip' 
     11        config_get tld      "$section" 'tld' 
    1112         
    12         iodined -l $address -P $password $tunnelip $tld 
     13        service_start /usr/sbin/iodined -l "$address" -P "$password" "$tunnelip" "$tld" 
    1314} 
    1415 
    1516start() { 
    16         config_load "iodined" 
    17         config_foreach start_service iodined 
     17        config_load 'iodined' 
     18        config_foreach start_instance 'iodined' 
    1819} 
    1920 
    2021stop() { 
    21         killall iodined 
     22        service_stop /usr/sbin/iodined 
    2223} 
Note: See TracChangeset for help on using the changeset viewer.