summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authoryangfl <yangfl@users.noreply.github.com>2018-10-10 13:12:34 +0800
committeryangfl <yangfl@users.noreply.github.com>2018-10-10 13:16:57 +0800
commit645a555f391044504886d6fcb5d6235911eb6869 (patch)
tree2ff56cc31cd34855108ef69ae0e253d87542c91e
parent701f6b0819a902e8c45e19c95aad7121f9c50145 (diff)
luci-mod-network: show bridges in ifacelist when the interface itself is not a bridge
It's completely OK to select a bridge as the underlying interface of other interfaces, say a tunnel or PPPoE. The only case which should be forbidden is bridge over bridge. Signed-off-by: David Yang <mmyangfl@gmail.com>
-rw-r--r--modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
index 8be354b44..bff859bef 100644
--- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
@@ -284,7 +284,7 @@ if not net:is_floating() then
ifname_single = s:taboption("physical", Value, "ifname_single", translate("Interface"))
ifname_single.template = "cbi/network_ifacelist"
ifname_single.widget = "radio"
- ifname_single.nobridges = true
+ ifname_single.nobridges = net:is_bridge()
ifname_single.noaliases = false
ifname_single.rmempty = false
ifname_single.network = arg[1]
@@ -341,7 +341,7 @@ end
if not net:is_virtual() then
ifname_multi = s:taboption("physical", Value, "ifname_multi", translate("Interface"))
ifname_multi.template = "cbi/network_ifacelist"
- ifname_multi.nobridges = true
+ ifname_multi.nobridges = net:is_bridge()
ifname_multi.noaliases = true
ifname_multi.rmempty = false
ifname_multi.network = arg[1]