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

luci-mod-admin-full: fix changing alias interface ifnames

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2018-07-15 17:21:02 +02:00
parent ffff1e7c0a
commit 4f0b755241
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
View file

@ -285,6 +285,7 @@ if not net:is_floating() then
ifname_single.template = "cbi/network_ifacelist" ifname_single.template = "cbi/network_ifacelist"
ifname_single.widget = "radio" ifname_single.widget = "radio"
ifname_single.nobridges = true ifname_single.nobridges = true
ifname_single.noaliases = false
ifname_single.rmempty = false ifname_single.rmempty = false
ifname_single.network = arg[1] ifname_single.network = arg[1]
ifname_single:depends("type", "") ifname_single:depends("type", "")
@ -295,12 +296,18 @@ if not net:is_floating() then
end end
function ifname_single.write(self, s, val) function ifname_single.write(self, s, val)
local i local _, i
local new_ifs = { } local new_ifs = { }
local old_ifs = { } local old_ifs = { }
for _, i in ipairs(net:get_interfaces() or { net:get_interface() }) do local alias = net:is_alias()
old_ifs[#old_ifs+1] = i:name()
if alias then
old_ifs[1] = '@' .. alias
else
for _, i in ipairs(net:get_interfaces() or { net:get_interface() }) do
old_ifs[#old_ifs+1] = i:name()
end
end end
for i in ut.imatch(val) do for i in ut.imatch(val) do
@ -335,6 +342,7 @@ if not net:is_virtual() then
ifname_multi = s:taboption("physical", Value, "ifname_multi", translate("Interface")) ifname_multi = s:taboption("physical", Value, "ifname_multi", translate("Interface"))
ifname_multi.template = "cbi/network_ifacelist" ifname_multi.template = "cbi/network_ifacelist"
ifname_multi.nobridges = true ifname_multi.nobridges = true
ifname_multi.noaliases = true
ifname_multi.rmempty = false ifname_multi.rmempty = false
ifname_multi.network = arg[1] ifname_multi.network = arg[1]
ifname_multi.widget = "checkbox" ifname_multi.widget = "checkbox"