modules/admin-full: various vlan fixes

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua b/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
index 149b5c6e6d6b25cbb006147ba906556db07058bf..c71b9a0f7b5c62e234fa2996bf3045dd232de34d 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
@@ -199,6 +199,7 @@ m.uci:foreach("network", "switch",
                local vid = s:option(Value, has_vlan4k or "vlan", "VLAN ID")
 
                vid.rmempty = false
+               vid.forcewrite = true
 
                -- Validate user provided VLAN ID, make sure its within the bounds
                -- allowed by the switch.
@@ -250,6 +251,7 @@ m.uci:foreach("network", "switch",
 
                        po.cfgvalue = portvalue
                        po.validate = portvalidate
+                       po.write    = function() end
 
                        port_opts[#port_opts+1] = po
                end