diff options
| author | Paul Oranje <p.oranje@xs4all.nl> | 2015-05-02 10:44:17 +0200 |
|---|---|---|
| committer | Paul Oranje <p.oranje@xs4all.nl> | 2015-05-02 10:44:17 +0200 |
| commit | ae8e971eef2be269beab9465139869055918d878 (patch) | |
| tree | 5314a2d5b494884271d8900cba6afc348952279b /protocols/luci-proto-ipv6 | |
| parent | 4742d1c2112ace9d1299c69fb086c1646bb04911 (diff) | |
| parent | 36879e9e8658601dc3e86ff9251da3fc3666efe0 (diff) | |
Merge branch 'master' of https://github.com/openwrt/luci into proto=ipv6+aiccu+fixes
Diffstat (limited to 'protocols/luci-proto-ipv6')
| -rw-r--r-- | protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua | 3 | ||||
| -rw-r--r-- | protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua index b76475828..2ed34faf7 100644 --- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua +++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua @@ -6,8 +6,11 @@ local map, section, net = ... local mode = section:taboption("general", ListValue, "mode", translate("Category")) mode:value("auto", translate("Automatic")) mode:value("external", translate("External")) +mode:value("internal", translate("Internal")) +mode:value("leaf", translate("Leaf")) mode:value("guest", translate("Guest")) mode:value("adhoc", translate("Ad-Hoc")) +mode:value("hybrid", translate("Hybrid")) mode.default = "auto" diff --git a/protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua index 4e9816bea..f525061be 100644 --- a/protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua +++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua @@ -12,5 +12,5 @@ function proto.is_installed(self) end function proto.opkg_package(self) - return "hnetd" + return "hnet-full" end |