From: Steven Barth <cyrus@openwrt.org>
Date: Wed, 8 Oct 2014 15:16:19 +0000 (+0000)
Subject: odhcp6c: don't assign addresses or prefixes prematurely
X-Git-Tag: reboot~5696
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c7a941cf0231384ce769281e9e8f93065675fa08;p=openwrt%2Fopenwrt.git

odhcp6c: don't assign addresses or prefixes prematurely

SVN-Revision: 42850
---

diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile
index 52d41a8d30..6ebfe4ee17 100644
--- a/package/network/ipv6/odhcp6c/Makefile
+++ b/package/network/ipv6/odhcp6c/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=odhcp6c
-PKG_VERSION:=2014-10-08
+PKG_VERSION:=2014-10-08.1
 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/odhcp6c.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6373af63310f32e1408a81f4e4e069a5f0d3e59e
+PKG_SOURCE_VERSION:=569a7bbe8a181b0e48cb12c751988406de3d7f0b
 PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script
index 37e67bfe52..0fedaaa1cd 100755
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.script
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script
@@ -158,6 +158,9 @@ case "$2" in
 	informed|updated|rebound|ra-updated)
 		setup_interface "$1"
 	;;
+	ra-updated)
+		[ -n "$ADDRESSES$RA_ADDRESSES$PREFIXES$USERPREFIX" ] && setup_interface "$1"
+	;;
 	started|stopped|unbound)
 		teardown_interface "$1"
 	;;