move dhcpv6 support into luci-proto-6x4, rename luci-proto-6x4 to luci-proto-ipv6

7 files changed, 32 insertions, 0 deletions

diff --git a/protocols/6x4/Makefile b/protocols/ipv6/Makefile
index f7fac7740..f7fac7740 100644
--- a/protocols/6x4/Makefile
+++ b/protocols/ipv6/Makefile
diff --git a/protocols/6x4/luasrc/model/cbi/admin_network/proto_6in4.lua b/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
index 0b1f31ce7..0b1f31ce7 100644
--- a/protocols/6x4/luasrc/model/cbi/admin_network/proto_6in4.lua
+++ b/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
diff --git a/protocols/6x4/luasrc/model/cbi/admin_network/proto_6rd.lua b/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua
index a4b50efa2..a4b50efa2 100644
--- a/protocols/6x4/luasrc/model/cbi/admin_network/proto_6rd.lua
+++ b/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6rd.lua
diff --git a/protocols/6x4/luasrc/model/cbi/admin_network/proto_6to4.lua b/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua
index d9d7b01a9..d9d7b01a9 100644
--- a/protocols/6x4/luasrc/model/cbi/admin_network/proto_6to4.lua
+++ b/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6to4.lua
diff --git a/protocols/core/luasrc/model/cbi/admin_network/proto_dhcpv6.lua b/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
index ad2430a8d..ad2430a8d 100644
--- a/protocols/core/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
+++ b/protocols/ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua
diff --git a/protocols/6x4/luasrc/model/network/proto_6x4.lua b/protocols/ipv6/luasrc/model/network/proto_6x4.lua
index b800b0b54..b800b0b54 100644
--- a/protocols/6x4/luasrc/model/network/proto_6x4.lua
+++ b/protocols/ipv6/luasrc/model/network/proto_6x4.lua
diff --git a/protocols/ipv6/luasrc/model/network/proto_dhcpv6.lua b/protocols/ipv6/luasrc/model/network/proto_dhcpv6.lua
new file mode 100644
index 000000000..e5e54d593
--- /dev/null
+++ b/protocols/ipv6/luasrc/model/network/proto_dhcpv6.lua
@@ -0,0 +1,32 @@
+--[[
+LuCI - Network model - dhcpv6 protocol extension
+
+Copyright 2013 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+local proto = luci.model.network:register_protocol("dhcpv6")
+
+function proto.get_i18n(self)
+	return luci.i18n.translate("DHCPv6 client")
+end
+
+function proto.is_installed(self)
+	return nixio.fs.access("/lib/netifd/proto/dhcpv6.sh")
+end
+
+function proto.opkg_package(self)
+	return "ipv6-support"
+end