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

luci-mod-network: allow disabling interface->device option migration

Browse source 
Introduce a `migrate` properties which selectively allows disabling the
`config interface` to `config device` migration logic for single options.

Use the new flag to disable migration of the "ipv6" option which has
different semantics in interface and device sections.

Ref: https://forum.openwrt.org/t/pppoe-disable-ipv6/92548
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2021-03-29 20:08:48 +02:00
parent 7dde01be3c
commit 935e9a3c34
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -131,7 +131,7 @@ function deviceCfgValue(section_id) {
var ds = lookupDevSection(this.section, section_id, false);
return (ds ? uci.get('network', ds, this.option) : null) ||
uci.get('network', section_id, this.option) ||
(this.migrate ? uci.get('network', section_id, this.option) : null) ||
this.default;
}
@ -139,7 +139,9 @@ function deviceWrite(section_id, formvalue) {
var ds = lookupDevSection(this.section, section_id, true);
uci.set('network', ds, this.option, formvalue);
uci.unset('network', section_id, this.option);
if (this.migrate)
uci.unset('network', section_id, this.option);
}
function deviceRemove(section_id) {
@ -162,7 +164,8 @@ function deviceRemove(section_id) {
uci.unset('network', ds, this.option);
}
uci.unset('network', section_id, this.option);
if (this.migrate)
uci.unset('network', section_id, this.option);
}
function deviceRefresh(section_id) {
@ -364,6 +367,7 @@ return baseclass.extend({
var o = this.replaceOption(s, tabName, optionClass, optionName, optionTitle, optionDescription);
if (s.sectiontype == 'interface' && optionName != 'type' && optionName != 'vlan_filtering') {
o.migrate = true;
o.cfgvalue = deviceCfgValue;
o.write = deviceWrite;
o.remove = deviceRemove;
@ -777,6 +781,7 @@ return baseclass.extend({
o.depends(simpledep);
o = this.addOption(s, gensection, form.Flag, 'ipv6', _('Enable IPv6'));
o.migrate = false;
o.default = o.enabled;
o.depends(simpledep);