diff options
| author | Steven Barth <steven@midlink.org> | 2013-06-19 13:29:06 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2013-06-19 13:29:06 +0000 |
| commit | 9a73251905f322de8ecadd45dfaaac9764c92eab (patch) | |
| tree | ec7441b7d9f386fb2b8e7441f826922e7afdba0b /package/odhcp6c | |
| parent | b8cf410262b1490f71cf0b1a52fa9202c5841a66 (diff) | |
| download | upstream-9a73251905f322de8ecadd45dfaaac9764c92eab.tar.gz upstream-9a73251905f322de8ecadd45dfaaac9764c92eab.tar.bz2 upstream-9a73251905f322de8ecadd45dfaaac9764c92eab.zip | |
AA: odhcp6c: backport r36959
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36970 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/odhcp6c')
| -rw-r--r-- | package/odhcp6c/Makefile | 4 | ||||
| -rwxr-xr-x | package/odhcp6c/files/dhcpv6.sh | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/package/odhcp6c/Makefile b/package/odhcp6c/Makefile index 6b960bacb1..4e1ecd35ab 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 b2264ed907..c5e77c65b4 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 |