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

luci-mod-network: fix changing ifname in disabled legacy bridge mode

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7dde01be3c)
This commit is contained in:
Jo-Philipp Wich 2021-03-29 16:33:07 +02:00 committed by Rafał Miłecki
parent 08f5bc236e
commit 9f76002dae
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js
View file

@ -382,16 +382,19 @@ return baseclass.extend({
disableLegacyBridging = isIface && deviceSectionExists(null, 'br-%s'.format(ifc.getName()), 'bridge'), disableLegacyBridging = isIface && deviceSectionExists(null, 'br-%s'.format(ifc.getName()), 'bridge'),
o, ss; o, ss;
/* If an externally configured br-xxx interface already exists, if (isIface) {
* then disable legacy bridge configuration */
if (disableLegacyBridging) {
o = this.addOption(s, gensection, form.HiddenValue, 'type');
o.cfgvalue = function() { return '' };
}
else if (isIface) {
var type; var type;
type = this.addOption(s, gensection, form.Flag, 'type', _('Bridge interfaces'), _('Creates a bridge over specified interface(s)')); /* If an externally configured br-xxx interface already exists,
* then disable legacy bridge configuration */
if (disableLegacyBridging) {
type = this.addOption(s, gensection, form.HiddenValue, 'type');
type.cfgvalue = function() { return '' };
}
else {
type = this.addOption(s, gensection, form.Flag, 'type', _('Bridge interfaces'), _('Creates a bridge over specified interface(s)'));
}
type.modalonly = true; type.modalonly = true;
type.disabled = ''; type.disabled = '';
type.enabled = 'bridge'; type.enabled = 'bridge';