From: cyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 19 Jun 2013 13:29:06 +0000 (+0000)
Subject: AA: odhcp6c: backport r36959
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=e4f57eaf76adf796397d26071645e5374e9dd7f6;p=12.09%2Fopenwrt.git

AA: odhcp6c: backport r36959

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36970 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/odhcp6c/Makefile b/package/odhcp6c/Makefile
index 6b960ba..4e1ecd3 100644
--- a/package/odhcp6c/Makefile
+++ b/package/odhcp6c/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=odhcp6c
-PKG_VERSION:=2013-06-13
+PKG_VERSION:=2013-06-18
 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:=83114b179091cb080f09cf4142ee1c9949ea4e30
+PKG_SOURCE_VERSION:=eaf3a11cad8a5dd389d5f52cc76e424e0242074b
 PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/odhcp6c/files/dhcpv6.sh b/package/odhcp6c/files/dhcpv6.sh
index b2264ed..c5e77c6 100755
--- a/package/odhcp6c/files/dhcpv6.sh
+++ b/package/odhcp6c/files/dhcpv6.sh
@@ -18,8 +18,8 @@ proto_dhcpv6_setup() {
 	local config="$1"
 	local iface="$2"
 
-	local reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix iface_dslite
-	json_get_vars reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix iface_dslite
+	local reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix iface_dslite ifaceid
+	json_get_vars reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix iface_dslite ifaceid
 
 
 	# Configure
@@ -35,6 +35,8 @@ proto_dhcpv6_setup() {
 
 	[ "$norelease" = "1" ] && append opts "-k"
 
+	[ -n "$ifaceid" ] && append opts "-i$ifaceid"
+
 	for opt in $reqopts; do
 		append opts "-r$opt"
 	done