modules/admin-full: merge services/dnsmasq and network/dhcpleases into network/dhcp

[project/luci.git] / modules / admin-full / luasrc / controller / admin / network.lua

diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua
index dd3468f..76d4320 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/network.lua
+++ b/modules/admin-full/luasrc/controller/admin/network.lua
@@ -106,9 +106,9 @@ function index()
        )
 
        if nixio.fs.access("/etc/config/dhcp") then
-               page = node("admin", "network", "dhcpleases")
-               page.target = cbi("admin_network/dhcpleases")
-               page.title  = i18n("DHCP Leases")
+               page = node("admin", "network", "dhcp")
+               page.target = cbi("admin_network/dhcp")
+               page.title  = i18n("DHCP and DNS")
                page.order  = 30
 
                page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil)
@@ -207,7 +207,7 @@ function iface_status()
        local rv   = { }
 
        local iface
-       for iface in path[#path]:gmatch("[%w%.%-]+") do
+       for iface in path[#path]:gmatch("[%w%.%-_]+") do
                local net = netm:get_network(iface)
                if net then
                        local info