diff options
| author | Steven Barth <cyrus@openwrt.org> | 2013-02-12 08:23:54 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2013-02-12 08:23:54 +0000 |
| commit | 99b69fd9c5a5645f2894da031832b9cfd8d4ab8e (patch) | |
| tree | 194f12132387b43477b3cbbfc219255b9b7d41f4 /package/network/ipv6/odhcp6c/files | |
| parent | eeaf2c0b5a987e586d895ba9cad22461c91abbf4 (diff) | |
| download | upstream-99b69fd9c5a5645f2894da031832b9cfd8d4ab8e.tar.gz upstream-99b69fd9c5a5645f2894da031832b9cfd8d4ab8e.tar.bz2 upstream-99b69fd9c5a5645f2894da031832b9cfd8d4ab8e.zip | |
odhcp6c: allow setting a user-provided prefix as well
SVN-Revision: 35570
Diffstat (limited to 'package/network/ipv6/odhcp6c/files')
| -rwxr-xr-x | package/network/ipv6/odhcp6c/files/dhcpv6.script | 2 | ||||
| -rwxr-xr-x | package/network/ipv6/odhcp6c/files/dhcpv6.sh | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script index 1f019353d5..56f8c39ca4 100755 --- a/package/network/ipv6/odhcp6c/files/dhcpv6.script +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script @@ -28,6 +28,8 @@ setup_interface () { proto_add_ipv6_prefix "$prefix" done + [ -n "$USERPREFIX" ] && proto_add_ipv6_prefix "$USERPREFIX" + # Merge addresses for entry in $RA_ADDRESSES; do local duplicate=0 diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh index 4bd3a67ed9..b1837a9c6a 100755 --- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh @@ -10,14 +10,15 @@ proto_dhcpv6_init_config() { proto_config_add_string "clientid" proto_config_add_string "reqopts" proto_config_add_string "noslaaconly" + proto_config_add_string "ip6prefix" } proto_dhcpv6_setup() { local config="$1" local iface="$2" - local reqaddress reqprefix clientid reqopts noslaaconly - json_get_vars reqaddress reqprefix clientid reqopts noslaaconly + local reqaddress reqprefix clientid reqopts noslaaconly ip6prefix + json_get_vars reqaddress reqprefix clientid reqopts noslaaconly ip6prefix # Configure @@ -35,6 +36,7 @@ proto_dhcpv6_setup() { append opts "-r$opt" done + [ -n "$ip6prefix" ] && proto_export "USERPREFIX=$ip6prefix" proto_export "INTERFACE=$config" proto_run_command "$config" odhcp6c \ |