X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fluci-mod-admin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fifaces.lua;h=4fc71cefab5cdbf2b82f36d6e49bb6aaf157a036;hb=8b39d9a76b6efcf618fe3ca527ca3e593deacaf0;hp=c2e5c72285dcd9b2a972dae8b36d4d0ba5b4d97a;hpb=6b1b7336f04dfe894476cd8918586cbdb318431b;p=project%2Fluci.git

diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index c2e5c7228..4fc71cefa 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -135,7 +135,7 @@ end
 
 -- dhcp setup was requested, create section and reload page
 if m:formvalue("cbid.dhcp._enable._enable") then
-	m.uci:section("dhcp", "dhcp", nil, {
+	m.uci:section("dhcp", "dhcp", arg[1], {
 		interface = arg[1],
 		start     = "100",
 		limit     = "150",
@@ -220,6 +220,12 @@ auto.default = (net:proto() == "none") and auto.disabled or auto.enabled
 delegate = s:taboption("advanced", Flag, "delegate", translate("Use builtin IPv6-management"))
 delegate.default = delegate.enabled
 
+force_link = s:taboption("advanced", Flag, "force_link",
+	translate("Force link"),
+	translate("Set interface properties regardless of the link carrier (If set, carrier sense events do not invoke hotplug handlers)."))
+
+force_link.default = (net:proto() == "static") and force_link.enabled or force_link.disabled
+
 
 if not net:is_virtual() then
 	br = s:taboption("physical", Flag, "type", translate("Bridge interfaces"), translate("creates a bridge over specified interface(s)"))
@@ -373,7 +379,7 @@ for _, field in ipairs(s.children) do
 		if next(field.deps) then
 			local _, dep
 			for _, dep in ipairs(field.deps) do
-				dep.deps.proto = net:proto()
+				dep.proto = net:proto()
 			end
 		else
 			field:depends("proto", net:proto())
@@ -439,7 +445,7 @@ if has_dnsmasq and net:proto() == "static" then
 		limit.datatype = "uinteger"
 		limit.default = "150"
 
-		local ltime = s:taboption("general", Value, "leasetime", translate("Leasetime"),
+		local ltime = s:taboption("general", Value, "leasetime", translate("Lease time"),
 			translate("Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."))
 		ltime.rmempty = true
 		ltime.default = "12h"
@@ -492,8 +498,9 @@ if has_dnsmasq and net:proto() == "static" then
 		o:value("relay", translate("relay mode"))
 		o:value("hybrid", translate("hybrid mode"))
 
-		o = s:taboption("ipv6", ListValue, "ra_management", translate("DHCPv6-Mode"))
-		o:value("", translate("stateless"))
+		o = s:taboption("ipv6", ListValue, "ra_management", translate("DHCPv6-Mode"),
+			translate("Default is stateless + stateful"))
+		o:value("0", translate("stateless"))
 		o:value("1", translate("stateless + stateful"))
 		o:value("2", translate("stateful-only"))
 		o:depends("dhcpv6", "server")