X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fdhcp.lua;h=17dcdb8f0071c4a07b26681957517210e27f7be7;hb=19c79a30b91354932b12ffb9f866471b06a570df;hp=7a4b3c1343338a3b07b04660e3c0c2e32aaebbe1;hpb=78fb71f88177ac7e9234065a8bdbe8310ffa95ad;p=project%2Fluci.git

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
index 7a4b3c1343..17dcdb8f00 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
@@ -11,8 +11,9 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
+require("luci.tools.webadmin")
 require("luci.model.uci")
-require("luci.sys")
+require("luci.util")
 
 m = Map("dhcp", "DHCP")
 
@@ -21,15 +22,23 @@ s.addremove = true
 s.anonymous = true
 
 iface = s:option(ListValue, "interface", translate("interface"))
-luci.model.uci.foreach("network", "interface",
+luci.tools.webadmin.cbi_add_networks(iface)
+
+local uci = luci.model.uci.cursor()
+uci:foreach("network", "interface",
 	function (section)
 		if section[".name"] ~= "loopback" then
 			iface.default = iface.default or section[".name"]
-			iface:value(section[".name"])
 			s:depends("interface", section[".name"])
 		end
 	end)
 
+uci:foreach("network", "alias",
+	function (section)
+		iface:value(section[".name"])
+		s:depends("interface", section[".name"])
+	end)
+
 s:option(Value, "start", translate("start")).rmempty = true
 
 s:option(Value, "limit", translate("limit")).rmempty = true
@@ -40,26 +49,20 @@ s:option(Flag, "dynamicdhcp").rmempty = true
 
 s:option(Value, "name", translate("name")).optional = true
 
-s:option(Flag, "ignore").optional = true
+ignore = s:option(Flag, "ignore")
+ignore.optional = true
 
 s:option(Value, "netmask", translate("netmask")).optional = true
 
 s:option(Flag, "force").optional = true
 
-for i, line in pairs(luci.sys.execl("dnsmasq --help dhcp")) do
-	k, v = line:match("([^ ]+) +([^ ]+)")
-	s:option(Value, "dhcp"..k, v).optional = true
-end
+s:option(DynamicList, "dhcp_option").optional = true
 
-m2 = Map("luci_ethers", translate("luci_ethers"))
 
-s = m2:section(TypedSection, "static_lease", "")
-s.addremove = true
-s.anonymous = true
-s.template = "cbi/tblsection"
-
-s:option(Value, "macaddr", translate("macaddress"))
-s:option(Value, "ipaddr", translate("ipaddress"))
+for i, n in ipairs(s.children) do
+	if n ~= iface and n ~= ignore then
+		n:depends("ignore", "")
+	end
+end
 
-	
-return m, m2
+return m
\ No newline at end of file