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

Fixes: #5081
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 671c94b034db9d7470d5f1e681b919158de205f6)

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js b/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js
index 199cd0f152e3da45fa95961bea816fe660babd54..80b4b2b34308ec6abfd2d1b492536e361eb50f79 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js
@@ -423,17 +423,19 @@ return baseclass.extend({
                o.default = (dev ? dev.getName() : '').match(/^.+\.\d+$/) ? dev.getName().replace(/\.\d+$/, '') : '';
                o.ucioption = 'ifname';
                o.validate = function(section_id, value) {
-                       var type = this.section.formvalue(section_id, 'type'),
-                           name = this.section.getUIElement(section_id, 'name_complex');
+                       if (isNew) {
+                               var type = this.section.formvalue(section_id, 'type'),
+                                   name = this.section.getUIElement(section_id, 'name_complex');
 
-                       if (type == 'macvlan' && value && name && !name.isChanged()) {
-                               var i = 0;
+                               if (type == 'macvlan' && value && name && !name.isChanged()) {
+                                       var i = 0;
 
-                               while (deviceSectionExists(section_id, '%smac%d'.format(value, i)))
-                                       i++;
+                                       while (deviceSectionExists(section_id, '%smac%d'.format(value, i)))
+                                               i++;
 
-                               name.setValue('%smac%d'.format(value, i));
-                               name.triggerValidation();
+                                       name.setValue('%smac%d'.format(value, i));
+                                       name.triggerValidation();
+                               }
                        }
 
                        return true;