aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2014-10-08 15:16:41 +0000
committerSteven Barth <steven@midlink.org>2014-10-08 15:16:41 +0000
commit22ed82bc860347519ad3ab26be00441d1241d23b (patch)
tree2f75144f679aaf944ba30d31268bbe8959801592
parentb398e14c636517356eefce2cbed17e5fc5e4c52a (diff)
downloadupstream-22ed82bc860347519ad3ab26be00441d1241d23b.tar.gz
upstream-22ed82bc860347519ad3ab26be00441d1241d23b.tar.bz2
upstream-22ed82bc860347519ad3ab26be00441d1241d23b.zip
odhcp6c: don't assign addresses or prefixes prematurely
git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42851 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/network/ipv6/odhcp6c/Makefile4
-rwxr-xr-xpackage/network/ipv6/odhcp6c/files/dhcpv6.script3
2 files changed, 5 insertions, 2 deletions
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"
;;