luci-0.9: merge r5590, r5591 and r5592

diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua
index 81a0f65cf77e55142db4d3e29376b6e32ee79bbe..46bd636b26da4f2bc080a57f66af10cf109564b3 100644 (file)
--- a/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua
+++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua
@@ -16,6 +16,7 @@ m = Map("firewall", translate("fw_fw"), translate("fw_fw1"))
 
 s = m:section(TypedSection, "defaults")
 s.anonymous = true
+s.addremove = false
 
 s:option(Flag, "syn_flood")
 

diff --git a/applications/luci-splash/luasrc/model/cbi/splash/splash.lua b/applications/luci-splash/luasrc/model/cbi/splash/splash.lua
index e9d000f0dd48c67f27d6f142abf595fb0550e683..145b16d5b0546d4761137ecbcb6514ec5ab4b12d 100644 (file)
--- a/applications/luci-splash/luasrc/model/cbi/splash/splash.lua
+++ b/applications/luci-splash/luasrc/model/cbi/splash/splash.lua
@@ -4,6 +4,8 @@ require("luci.model.uci")
 m = Map("luci_splash", "Client-Splash", [[Client-Splash ist das Freifunk Hotspot-Authentifizierungs-System.]])
 
 s = m:section(NamedSection, "general", "core", "Allgemein")
+s.addremove = false
+
 s:option(Value, "leasetime", "Freigabezeit", "h")
 
 s:option(Value, "limit_up", "Upload-Limitierung", "Kilobyte/s - limitiert die Upload-Geschwindigkeit von Clients")

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
index 8fd536888435e3c597d036e6eaab37003673de02..0d0ce2c9a2e64bcd4fcfe7f52cebfbbe70360605 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
@@ -25,6 +25,7 @@ local netstat = sys.net.deviceinfo()
 
 s = m:section(TypedSection, "interface", "")
 s.addremove = true
+s.anonymous = false
 s.extedit   = luci.dispatcher.build_url("admin", "network", "network") .. "/%s"
 s.template  = "cbi/tblsection"
 s.override_scheme = true

diff --git a/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua b/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua
index 04ec1e15c44319ad61a2791f9d8b9a5eba7765a4..7977778652f6b203c4a3568e393ca8205a86f636 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_services/dnsmasq.lua
@@ -15,6 +15,7 @@ m = Map("dhcp", "Dnsmasq")
 
 s = m:section(TypedSection, "dnsmasq", translate("settings"))
 s.anonymous = true
+s.addremove = false
 
 s:option(Flag, "domainneeded")
 s:option(Flag, "authoritative")
@@ -42,4 +43,4 @@ s:option(Flag, "enable_tftp").optional = true
 s:option(Value, "tftp_root").optional = true
 s:option(Value, "dhcp_boot").optional = true
 
-return m
\ No newline at end of file
+return m