[packages_10.03.2] igmpproxy: merge r29083

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30207 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/igmpproxy/Makefile b/net/igmpproxy/Makefile
index b420fc5..43e13bb 100644 (file)
--- a/net/igmpproxy/Makefile
+++ b/net/igmpproxy/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=igmpproxy
 PKG_VERSION:=0.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/igmpproxy

diff --git a/net/igmpproxy/files/igmpproxy.conf b/net/igmpproxy/files/igmpproxy.conf
index cffc80f..e01b918 100644 (file)
--- a/net/igmpproxy/files/igmpproxy.conf
+++ b/net/igmpproxy/files/igmpproxy.conf
@@ -27,14 +27,14 @@ quickleave
 ##------------------------------------------------------
 ## Configuration for eth0 (Upstream Interface)
 ##------------------------------------------------------
-phyint vlan0 upstream  ratelimit 0  threshold 1
+phyint br-wan upstream  ratelimit 0  threshold 1
         altnet 192.168.1.0/24
 
 
 ##------------------------------------------------------
 ## Configuration for eth1 (Downstream Interface)
 ##------------------------------------------------------
-phyint vlan1 downstream  ratelimit 0  threshold 1
+phyint br-lan downstream  ratelimit 0  threshold 1
 
 
 ##------------------------------------------------------

diff --git a/net/igmpproxy/files/igmpproxy.init b/net/igmpproxy/files/igmpproxy.init
index 5565d31..80e1bad 100644 (file)
--- a/net/igmpproxy/files/igmpproxy.init
+++ b/net/igmpproxy/files/igmpproxy.init
@@ -1,9 +1,12 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2010 OpenWrt.org
+# Copyright (C) 2010-2011 OpenWrt.org
 
 START=99
 STOP=10
 
+SERVICE_DAEMONIZE=1
+SERVICE_WRITE_PID=1
+
 # igmpproxy supports both a debug mode and verbosity, which are very useful
 # when something isn't working.
 #
@@ -13,21 +16,16 @@ STOP=10
 # Put any debug or verbosity options into IGMP_OPTS
 #
 # Examples:
-# IGMP_OPTS="-d -v -v" - debug mode and very verbose, this will land in
+# OPTIONS="-d -v -v" - debug mode and very verbose, this will land in
 #                        stdout and not in syslog
-# IGMP_OPTS="-v" - be verbose, this will write aditional information to syslog
+# OPTIONS="-v" - be verbose, this will write aditional information to syslog
 
-IGMP_OPTS=""
-IGMP_BIN="/usr/sbin/igmpproxy"
-IGMP_CNF="/etc/igmpproxy.conf"
-PID_F="/var/run/igmpproxy.pid"
+OPTIONS=""
 
 start() {
-       echo "Starting igmpproxy"
-       start-stop-daemon -S -x $IGMP_BIN -p $PID_F -b -m -- $IGMP_OPTS $IGMP_CNF
+       service_start /usr/sbin/igmpproxy $OPTIONS /etc/igmpproxy.conf
 }
 
 stop() {
-       echo "Stopping igmpporxy"
-       start-stop-daemon -K -x $IGMP_BIN -p $PID_F -q
+       service_stop /usr/sbin/igmpproxy
 }