Merge pull request #7725 from slapers/network-secondaries-issue

fix incorrect secondary ip handling, fixes #7724
This commit is contained in:
Michael DeHaan 2014-08-08 13:50:52 -04:00
commit a48328fa12

View file

@ -1581,7 +1581,7 @@ class LinuxNetwork(Network):
iface = words[-1]
if iface != device:
interfaces[iface] = {}
if not secondary or "ipv4" not in interfaces[iface]:
if not secondary and "ipv4" not in interfaces[iface]:
interfaces[iface]['ipv4'] = {'address': address,
'netmask': netmask,
'network': network}