6relayd: reduce fallout of RA spamming a bit

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38488 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/network/ipv6/6relayd/Makefile b/package/network/ipv6/6relayd/Makefile
index a515b7c..6f3c173 100644 (file)
--- a/package/network/ipv6/6relayd/Makefile
+++ b/package/network/ipv6/6relayd/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6relayd
-PKG_VERSION:=2013-07-26.1
+PKG_VERSION:=2013-10-21
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=git://github.com/sbyx/6relayd.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2ed520c500b0fbb484cfad5687eb39a0da43dcf7
+PKG_SOURCE_VERSION:=ad00c3dd9ee42f172870708724858ab502b3a689
 
 PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
 

diff --git a/package/network/ipv6/6relayd/files/6relayd.hotplug b/package/network/ipv6/6relayd/files/6relayd.hotplug
index 7905282..fc9d680 100644 (file)
--- a/package/network/ipv6/6relayd/files/6relayd.hotplug
+++ b/package/network/ipv6/6relayd/files/6relayd.hotplug
@@ -1,6 +1,6 @@
 #!/bin/sh
 /etc/init.d/6relayd enabled || exit 0
-[ -n "$INTERFACE" ] || exit 0
+[ -n "$INTERFACE" -a "$ACTION" != "ifupdate" ] || exit 0
 
 . /etc/init.d/6relayd
 restart_affected "$INTERFACE"