Index: umc/js/setup/ApplianceWizard.js =================================================================== --- umc/js/setup/ApplianceWizard.js (Revision 52197) +++ umc/js/setup/ApplianceWizard.js (Arbeitskopie) @@ -1712,45 +1712,50 @@ interfaces: {} }; if (this._isDHCPPreConfigured() && _vals._dhcp) { - // nothing to do... leave the preconfigurred settings + // nothing to do... leave the preconfigured settings } - else if (_vals._dhcp) { - // activate DHCP configuration for eth0 - vals.interfaces.eth0 = { - name: 'eth0', - interfaceType: 'Ethernet', - ip4dynamic: true - }; - vals['interfaces/primary'] = 'eth0'; - } else { // prepare values for network interfaces array.forEach(this._getNetworkDevices(), function(idev, i) { - // make sure valid values are set - var iip = _vals['_ip' + i]; - var imask = _vals['_netmask' + i]; - if (!iip || !imask) { - return; + if (_vals._dhcp) { + // activate DHCP configuration + vals.interfaces[idev] = { + name: idev, + interfaceType: 'Ethernet', + ip4dynamic: true + }; + if (i === 0) { + // the first interface will be the primary + vals['interfaces/primary'] = idev; + } } - if (!vals['interfaces/primary']) { - vals['interfaces/primary'] = idev; - } + else { + // make sure valid values are set + var iip = _vals['_ip' + i]; + var imask = _vals['_netmask' + i]; + if (!iip || !imask) { + return; + } + if (!vals['interfaces/primary']) { + vals['interfaces/primary'] = idev; + } - // prepare interface entry - var iconf = { - name: idev, - interfaceType: 'Ethernet' - }; - if (_regIPv4.test(iip)) { - // IPv4 address - iconf.ip4 = [[iip, imask]]; - iconf.ip6 = []; - } else { - // IPv6 address - iconf.ip4 = []; - iconf.ip6 = [[iip, imask]]; + // prepare interface entry + var iconf = { + name: idev, + interfaceType: 'Ethernet' + }; + if (_regIPv4.test(iip)) { + // IPv4 address + iconf.ip4 = [[iip, imask]]; + iconf.ip6 = []; + } else { + // IPv6 address + iconf.ip4 = []; + iconf.ip6 = [[iip, imask, 'default']]; + } + vals.interfaces[idev] = iconf; } - vals.interfaces[idev] = iconf; }); }