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

luci-mod-network: don't accidentally reset macvlan device names

Browse source 
Fixes: #5081
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 671c94b034)
This commit is contained in:
Jo-Philipp Wich 2021-06-01 14:35:31 +02:00
parent 1818ddcac3
commit 5bdb5fd697
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -423,17 +423,19 @@ return baseclass.extend({
o.default = (dev ? dev.getName() : '').match(/^.+\.\d+$/) ? dev.getName().replace(/\.\d+$/, '') : ''; o.default = (dev ? dev.getName() : '').match(/^.+\.\d+$/) ? dev.getName().replace(/\.\d+$/, '') : '';
o.ucioption = 'ifname'; o.ucioption = 'ifname';
o.validate = function(section_id, value) { o.validate = function(section_id, value) {
var type = this.section.formvalue(section_id, 'type'), if (isNew) {
name = this.section.getUIElement(section_id, 'name_complex'); var type = this.section.formvalue(section_id, 'type'),
name = this.section.getUIElement(section_id, 'name_complex');
if (type == 'macvlan' && value && name && !name.isChanged()) { if (type == 'macvlan' && value && name && !name.isChanged()) {
var i = 0; var i = 0;
while (deviceSectionExists(section_id, '%smac%d'.format(value, i))) while (deviceSectionExists(section_id, '%smac%d'.format(value, i)))
i++; i++;
name.setValue('%smac%d'.format(value, i)); name.setValue('%smac%d'.format(value, i));
name.triggerValidation(); name.triggerValidation();
}
} }
return true; return true;