Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-0.10: merge r6700

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-01-10 18:42:28 +00:00
parent 43a7436644
commit b58cd2ba20
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
View file

@ -25,6 +25,8 @@ m.uci:foreach("network", "switch",
local num_ports = 5
local cpu_port = 5
local enable_vlan4k = false
-- Parse some common switch properties from swconfig help output.
local swc = io.popen("swconfig dev %q help 2>/dev/null" % switch_name)
if swc then
@ -55,6 +57,9 @@ m.uci:foreach("network", "switch",
if is_vlan_attr then has_vlan4k = line:match(": (%w+)") end
if is_port_attr then has_ptpvid = line:match(": (%w+)") end
elseif line:match(": enable_vlan4k") then
enable_vlan4k = true
end
end
@ -99,6 +104,10 @@ m.uci:foreach("network", "switch",
s:option(Flag, "enable_vlan", translate("Enable VLAN functionality"))
.cfgvalue = function(self, section) return Flag.cfgvalue(self, section) or self.enabled end
if enable_vlan4k then
s:option(Flag, "enable_vlan4k", translate("Enable 4K VLANs"))
end
s:option(Flag, "reset", translate("Reset switch during setup"))
.cfgvalue = function(self, section) return Flag.cfgvalue(self, section) or self.enabled end