View | Details | Raw Unified | Return to bug 34484
Collapse All | Expand All

(-)umc/js/setup/ApplianceWizard.js (-32 / +37 lines)
 Lines 1712-1756    Link Here 
1712
				interfaces: {}
1712
				interfaces: {}
1713
			};
1713
			};
1714
			if (this._isDHCPPreConfigured() && _vals._dhcp) {
1714
			if (this._isDHCPPreConfigured() && _vals._dhcp) {
1715
				// nothing to do... leave the preconfigurred settings
1715
				// nothing to do... leave the preconfigured settings
1716
			}
1716
			}
1717
			else if (_vals._dhcp) {
1718
				// activate DHCP configuration for eth0
1719
				vals.interfaces.eth0 = {
1720
					name: 'eth0',
1721
					interfaceType: 'Ethernet',
1722
					ip4dynamic: true
1723
				};
1724
				vals['interfaces/primary'] = 'eth0';
1725
			}
1726
			else {
1717
			else {
1727
				// prepare values for network interfaces
1718
				// prepare values for network interfaces
1728
				array.forEach(this._getNetworkDevices(), function(idev, i) {
1719
				array.forEach(this._getNetworkDevices(), function(idev, i) {
1729
					// make sure valid values are set
1720
					if (_vals._dhcp) {
1730
					var iip = _vals['_ip' + i];
1721
						// activate DHCP configuration
1731
					var imask = _vals['_netmask' + i];
1722
						vals.interfaces[idev] = {
1732
					if (!iip || !imask) {
1723
							name: idev,
1733
						return;
1724
							interfaceType: 'Ethernet',
1725
							ip4dynamic: true
1726
						};
1727
						if (i === 0) {
1728
							// the first interface will be the primary
1729
							vals['interfaces/primary'] = idev;
1730
						}
1734
					}
1731
					}
1735
					if (!vals['interfaces/primary']) {
1732
					else {
1736
						vals['interfaces/primary'] = idev;
1733
						// make sure valid values are set
1737
					}
1734
						var iip = _vals['_ip' + i];
1735
						var imask = _vals['_netmask' + i];
1736
						if (!iip || !imask) {
1737
							return;
1738
						}
1739
						if (!vals['interfaces/primary']) {
1740
							vals['interfaces/primary'] = idev;
1741
						}
1738
1742
1739
					// prepare interface entry
1743
						// prepare interface entry
1740
					var iconf = {
1744
						var iconf = {
1741
						name: idev,
1745
							name: idev,
1742
						interfaceType: 'Ethernet'
1746
							interfaceType: 'Ethernet'
1743
					};
1747
						};
1744
					if (_regIPv4.test(iip)) {
1748
						if (_regIPv4.test(iip)) {
1745
						// IPv4 address
1749
							// IPv4 address
1746
						iconf.ip4 = [[iip, imask]];
1750
							iconf.ip4 = [[iip, imask]];
1747
						iconf.ip6 = [];
1751
							iconf.ip6 = [];
1748
					} else {
1752
						} else {
1749
						// IPv6 address
1753
							// IPv6 address
1750
						iconf.ip4 = [];
1754
							iconf.ip4 = [];
1751
						iconf.ip6 = [[iip, imask]];
1755
							iconf.ip6 = [[iip, imask, 'default']];
1756
						}
1757
						vals.interfaces[idev] = iconf;
1752
					}
1758
					}
1753
					vals.interfaces[idev] = iconf;
1754
				});
1759
				});
1755
			}
1760
			}
1756
1761

Return to bug 34484