diff options
| author | Steven Barth <steven@midlink.org> | 2013-12-15 19:38:53 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2013-12-15 19:38:53 +0000 |
| commit | edbe06f4ee0b5a90f92b05c1db5de4f32c54fa43 (patch) | |
| tree | 71e06ac05f12023cb29ec48d190713e88c84f85a /package/network/config/netifd/files | |
| parent | 430e4caa0f03bf39f59c73acbac1d76feacc4d67 (diff) | |
| download | master-187ad058-edbe06f4ee0b5a90f92b05c1db5de4f32c54fa43.tar.gz master-187ad058-edbe06f4ee0b5a90f92b05c1db5de4f32c54fa43.tar.bz2 master-187ad058-edbe06f4ee0b5a90f92b05c1db5de4f32c54fa43.zip | |
Convert DHCP->6rd and DHCPv6->DS-Lite autoconfig to dynamic interface
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39061 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/config/netifd/files')
| -rwxr-xr-x | package/network/config/netifd/files/lib/netifd/dhcp.script | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/package/network/config/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script index 50163da514..77b77f5fec 100755 --- a/package/network/config/netifd/files/lib/netifd/dhcp.script +++ b/package/network/config/netifd/files/lib/netifd/dhcp.script @@ -44,19 +44,18 @@ setup_interface () { ip6rd="${ip6rd#* }" local ip6rdbr="${ip6rd%% *}" -uci -q batch <<-EOF >/dev/null -set network.$IFACE6RD.proto=6rd -set network.$IFACE6RD.auto=0 -set network.$IFACE6RD.peeraddr=$ip6rdbr -set network.$IFACE6RD.ip4prefixlen=$v4mask -set network.$IFACE6RD.ip6prefix=$ip6rdprefix -set network.$IFACE6RD.ip6prefixlen=$ip6rdprefixlen -commit network -EOF + json_init + json_add_string name "$IFACE6RD" + json_add_string ifname "@$INTERFACE" + json_add_string proto "6rd" + json_add_string peeraddr "$ip6rdbr" + json_add_int ip4prefixlen "$v4mask" + json_add_string ip6prefix "$ip6rdprefix" + json_add_int ip6prefixlen "$ip6rdprefixlen" + json_add_string tunlink "$INTERFACE" + json_close_object - ifdown "$IFACE6RD" - /etc/init.d/network reload - ifup "$IFACE6RD" + ubus call network add_dynamic "$(json_dump)" fi # TODO |